diff --git a/debian/patches/0002-change-lib-denpendency-to-usr-dir.patch b/debian/patches/0002-change-lib-denpendency-to-usr-dir.patch deleted file mode 100644 index 344e81a..0000000 --- a/debian/patches/0002-change-lib-denpendency-to-usr-dir.patch +++ /dev/null @@ -1,146 +0,0 @@ -Description: change lib denpendency from $CURDIR/lib to /usr/share/java ---- a/build.properties -+++ b/build.properties -@@ -10,6 +10,8 @@ - local.software.home =/fs/pugh/pugh - #local.software.home =/user/daveho/local - -+sys.jar.dir =/usr/share/java -+ - # Set this to the directory containing the DocBook Modular XSL Stylesheets - # from http://docbook.sourceforge.net/projects/xsl/ - -@@ -27,7 +29,7 @@ - # is installed. - - #saxon.home =${local.software.home}/saxon-6.5.5 --saxon.home =/usr/share/java -+saxon.home =${sys.jar.dir} - - # Set this to the directory where FOP (http://xml.apache.org/fop/) - # is installed. (Note: this is disabled for now.) ---- a/build.xml -+++ b/build.xml -@@ -60,23 +60,23 @@ - - - -- -+ - -- -- -- -- -- -+ -+ -+ -+ -+ - - -- -- -+ -+ - - - - - -- -+ - - - -@@ -126,16 +126,16 @@ - - -- -+ - -- -- -- -- -- -+ -+ -+ -+ -+ - - -- -+ - - - -@@ -313,7 +313,7 @@ - - - -- -+ - - - -@@ -348,18 +348,18 @@ - - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - -- -- -+ -+ - - -- -+ - - - -@@ -512,7 +512,7 @@ - jvmargs="-ea -Xmx1200m" - projectName="Byte code Engineering Library (BCEL)" - outputFile="${sampleoutput.dir}/bcel-cloud.xml" > -- -+ - - --> - -@@ -994,13 +994,13 @@ - - - -- -- -- -- -- -+ -+ -+ -+ -+ - -- -+ - - - diff --git a/debian/patches/0002-change-lib-dependency-to-usr-dir.patch b/debian/patches/0002-change-lib-dependency-to-usr-dir.patch new file mode 100644 index 0000000..ae7e269 --- /dev/null +++ b/debian/patches/0002-change-lib-dependency-to-usr-dir.patch @@ -0,0 +1,146 @@ +Description: change lib dependency from $CURDIR/lib to /usr/share/java +--- a/build.properties ++++ b/build.properties +@@ -10,6 +10,8 @@ + local.software.home =/fs/pugh/pugh + #local.software.home =/user/daveho/local + ++sys.jar.dir =/usr/share/java ++ + # Set this to the directory containing the DocBook Modular XSL Stylesheets + # from http://docbook.sourceforge.net/projects/xsl/ + +@@ -27,7 +29,7 @@ + # is installed. + + #saxon.home =${local.software.home}/saxon-6.5.5 +-saxon.home =/usr/share/java ++saxon.home =${sys.jar.dir} + + # Set this to the directory where FOP (http://xml.apache.org/fop/) + # is installed. (Note: this is disabled for now.) +--- a/build.xml ++++ b/build.xml +@@ -60,23 +60,23 @@ + + + +- ++ + +- +- +- +- +- ++ ++ ++ ++ ++ + + +- +- ++ ++ + + + + + +- ++ + + + +@@ -126,16 +126,16 @@ + + +- ++ + +- +- +- +- +- ++ ++ ++ ++ ++ + + +- ++ + + + +@@ -313,7 +313,7 @@ + + + +- ++ + + + +@@ -348,18 +348,18 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + +- +- ++ ++ + + +- ++ + + + +@@ -512,7 +512,7 @@ + jvmargs="-ea -Xmx1200m" + projectName="Byte code Engineering Library (BCEL)" + outputFile="${sampleoutput.dir}/bcel-cloud.xml" > +- ++ + + --> + +@@ -994,13 +994,13 @@ + + + +- +- +- +- +- ++ ++ ++ ++ ++ + +- ++ + + + diff --git a/debian/patches/0011-upstream-change-license.patch b/debian/patches/0011-upstream-change-license.patch new file mode 100644 index 0000000..bfb9656 --- /dev/null +++ b/debian/patches/0011-upstream-change-license.patch @@ -0,0 +1,43 @@ +commit 2df3880705ea963a5a8504043468e08b5255ada3 +Author: yesx +Date: Tue Oct 8 15:17:10 2013 +0800 + + apply upstream changes of r14800, update copyright of src/gui/edu/umd/cs/findbugs/gui2/CloudCommentsPane.java + +diff --git a/src/gui/edu/umd/cs/findbugs/gui2/CloudCommentsPane.java b/src/gui/edu/umd/cs/findbugs/gui2/CloudCommentsPane.java +index 4b2b9a1..1d9869f 100644 +--- a/src/gui/edu/umd/cs/findbugs/gui2/CloudCommentsPane.java ++++ b/src/gui/edu/umd/cs/findbugs/gui2/CloudCommentsPane.java +@@ -1,20 +1,20 @@ + /* +- * Copyright 2010 Keith Lea ++ * FindBugs - Find bugs in Java programs ++ * Copyright (C) 2010-2013 University of Maryland + * +- * This file is part of FindBugs-IDEA. ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. + * +- * FindBugs-IDEA is free software: you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or +- * (at your option) any later version. +- * +- * FindBugs-IDEA is distributed in the hope that it will be useful, ++ * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. + * +- * You should have received a copy of the GNU General Public License +- * along with FindBugs-IDEA. If not, see . ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + package edu.umd.cs.findbugs.gui2; diff --git a/debian/patches/0012-upstream-change-license.patch b/debian/patches/0012-upstream-change-license.patch new file mode 100644 index 0000000..e23dc66 --- /dev/null +++ b/debian/patches/0012-upstream-change-license.patch @@ -0,0 +1,80 @@ +commit e6452ea9d3895df1113999d1aa32c98486dd2de7 +Author: yesx +Date: Fri Sep 20 16:35:15 2013 +0800 + + apply upstream changes of r14773, update copyright of src/antTask/edu/umd/cs/findbugs/anttask/FindBugsTask.java + update debian/copyright + +diff --git a/src/antTask/edu/umd/cs/findbugs/anttask/FindBugsTask.java b/src/antTask/edu/umd/cs/findbugs/anttask/FindBugsTask.java +index 8d91534..ce76e49 100644 +--- a/src/antTask/edu/umd/cs/findbugs/anttask/FindBugsTask.java ++++ b/src/antTask/edu/umd/cs/findbugs/anttask/FindBugsTask.java +@@ -1,55 +1,20 @@ + /* +- * The Apache Software License, Version 1.1 ++ * FindBugs - Find Bugs in Java programs ++ * Copyright (C) 2003-2013 University of Maryland + * +- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights +- * reserved. ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. + * +- * Redistribution and use in source and binary forms, with or without +- * modification, are permitted provided that the following conditions +- * are met: ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. + * +- * 1. Redistributions of source code must retain the above copyright +- * notice, this list of conditions and the following disclaimer. +- * +- * 2. Redistributions in binary form must reproduce the above copyright +- * notice, this list of conditions and the following disclaimer in +- * the documentation and/or other materials provided with the +- * distribution. +- * +- * 3. The end-user documentation included with the redistribution, if +- * any, must include the following acknowlegement: +- * "This product includes software developed by the +- * Apache Software Foundation (http://www.apache.org/)." +- * Alternately, this acknowlegement may appear in the software itself, +- * if and wherever such third-party acknowlegements normally appear. +- * +- * 4. The names "Ant" and "Apache Software +- * Foundation" must not be used to endorse or promote products derived +- * from this software without prior written permission. For written +- * permission, please contact apache@apache.org. +- * +- * 5. Products derived from this software may not be called "Apache" +- * nor may "Apache" appear in their names without prior written +- * permission of the Apache Group. +- * +- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR +- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +- * SUCH DAMAGE. +- * ==================================================================== +- * +- * This software consists of voluntary contributions made by many +- * individuals on behalf of the Apache Software Foundation. For more +- * information on the Apache Software Foundation, please see +- * . ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + package edu.umd.cs.findbugs.anttask; diff --git a/debian/patches/series b/debian/patches/series index 4ff8ecb..a16b3c1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,5 @@ 0001-fix-ant-docs.patch -0002-change-lib-denpendency-to-usr-dir.patch +0002-change-lib-dependency-to-usr-dir.patch 0003-fix-findbugs-lib-denpendency.patch 0004-remove-manual_ja_xml.patch 0005-remove-lib-AppleJavaExtensions.patch @@ -8,3 +8,5 @@ use-system-jar.patch 0009-fix-buildxml-lib-denpendency-for-bcel-jformatstring.patch 0010-improve-fb-help-information.patch +0011-upstream-change-license.patch +0012-upstream-change-license.patch