Author: nthykier Date: 2010-12-03 13:49:09 +0000 (Fri, 03 Dec 2010) New Revision: 13134
Added: trunk/bcel/debian/patches/linkjavadoc.patch trunk/bcel/debian/patches/series Modified: trunk/bcel/debian/changelog trunk/bcel/debian/control trunk/bcel/debian/patches/build.xml.patch trunk/bcel/debian/rules Log: Remove unused (B-)D, bump S-V and use 3.0 (quilt) to apply patches. Modified: trunk/bcel/debian/changelog =================================================================== --- trunk/bcel/debian/changelog 2010-12-03 11:29:50 UTC (rev 13133) +++ trunk/bcel/debian/changelog 2010-12-03 13:49:09 UTC (rev 13134) @@ -5,9 +5,14 @@ * Use javahelper to calculate the recommends for the jacvadoc. * Added patch description to patches. * Updated the version number in the manifest. - * Made patches compatible with quilt. + * Made patches compatible with quilt and let the 3.0 (quilt) + source apply them. + - This lead to a split of build.xml.patch into two patches. * Bumped debhelper compat to 7. * Use mh_clean to clean up after the mh_* commands. + * Bumped S-V to 3.9.1 - no changes required. + * Removed libxerces2-java and libregexp-java from (Build-)Depends + - They are not used (anymore?). -- Niels Thykier <[email protected]> Fri, 03 Dec 2010 12:15:08 +0100 Modified: trunk/bcel/debian/control =================================================================== --- trunk/bcel/debian/control 2010-12-03 11:29:50 UTC (rev 13133) +++ trunk/bcel/debian/control 2010-12-03 13:49:09 UTC (rev 13134) @@ -3,16 +3,16 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Michael Koch <[email protected]>, Torsten Werner <[email protected]> -Build-Depends-Indep: maven-repo-helper, default-jdk, libregexp-java, libxerces2-java, default-jdk-doc, javahelper (>= 0.32~) +Build-Depends-Indep: maven-repo-helper, default-jdk, default-jdk-doc, javahelper (>= 0.32~) Build-Depends: ant (>= 1.6.5), cdbs (>= 0.4.5.3), debhelper (>= 7) -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Homepage: http://jakarta.apache.org/bcel/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/bcel Vcs-Browser: http://wsvn.debian.org/svn/pkg-java/trunk/bcel/ Package: libbcel-java Architecture: all -Depends: libregexp-java, ${misc:Depends}, ${java:Depends} +Depends: ${misc:Depends}, ${java:Depends} Suggests: libbcel-java-doc Description: Analyze, create, and manipulate (binary) Java class files The Byte Code Engineering Library is intended to give users a convenient Modified: trunk/bcel/debian/patches/build.xml.patch =================================================================== --- trunk/bcel/debian/patches/build.xml.patch 2010-12-03 11:29:50 UTC (rev 13133) +++ trunk/bcel/debian/patches/build.xml.patch 2010-12-03 13:49:09 UTC (rev 13134) @@ -1,9 +1,9 @@ -Description: Disable fetching files from the net and link - javadoc against system javadoc. +Description: Disable proxy/fetching files from the net- +Author: Paul Cager <[email protected]> ---- a/build.xml 2006-06-03 04:48:22.000000000 +0100 -+++ b/build.xml 2007-01-09 11:12:59.000000000 +0000 -@@ -108,10 +108,4 @@ +--- a/build.xml 2010-12-03 13:42:28.000000000 +0000 ++++ b/build.xml 2010-12-03 13:42:50.296517505 +0000 +@@ -109,12 +109,6 @@ </javadoc> </target> <target name="get-deps" unless="noget" depends="init"> @@ -14,13 +14,5 @@ - <get dest="${libdir}/regexp-1.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/regexp/jars/regexp-1.2.jar";> - </get> </target> ---- a/build.xml 2007-01-14 22:11:59.000000000 +0000 -+++ b/build.xml 2007-01-14 22:21:35.000000000 +00x00 -@@ -105,6 +105,7 @@ - <path refid="build.classpath"> - </path> - </classpath> -+ <link href="/usr/share/doc/default-jdk-doc/api/" /> - </javadoc> - </target> - <target name="get-deps" unless="noget" depends="init"> + <target name="install-maven"> + <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"> Added: trunk/bcel/debian/patches/linkjavadoc.patch =================================================================== --- trunk/bcel/debian/patches/linkjavadoc.patch (rev 0) +++ trunk/bcel/debian/patches/linkjavadoc.patch 2010-12-03 13:49:09 UTC (rev 13134) @@ -0,0 +1,13 @@ +Description: Link javadoc against system javadoc. +Author: Paul Cager <[email protected]> + +--- a/build.xml 2007-01-14 22:11:59.000000000 +0000 ++++ b/build.xml 2007-01-14 22:21:35.000000000 +00x00 +@@ -105,6 +105,7 @@ + <path refid="build.classpath"> + </path> + </classpath> ++ <link href="/usr/share/doc/default-jdk-doc/api/" /> + </javadoc> + </target> + <target name="get-deps" unless="noget" depends="init"> Added: trunk/bcel/debian/patches/series =================================================================== --- trunk/bcel/debian/patches/series (rev 0) +++ trunk/bcel/debian/patches/series 2010-12-03 13:49:09 UTC (rev 13134) @@ -0,0 +1,3 @@ +linkjavadoc.patch +build.xml.patch +manifest.patch Modified: trunk/bcel/debian/rules =================================================================== --- trunk/bcel/debian/rules 2010-12-03 11:29:50 UTC (rev 13133) +++ trunk/bcel/debian/rules 2010-12-03 13:49:09 UTC (rev 13134) @@ -1,7 +1,6 @@ #!/usr/bin/make -f # debian/rules file for libbcel-java (uses cdbs) -include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/javahelper.mk include /usr/share/cdbs/1/class/ant.mk @@ -9,7 +8,7 @@ PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar xmlParserAPIs xercesImpl regexp +DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar DEB_ANT_BUILD_TARGET := dist install/lib$(PACKAGE)-java:: _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
