Author: drazzib Date: 2011-03-06 01:01:45 +0000 (Sun, 06 Mar 2011) New Revision: 13393
Added: trunk/cglib/debian/patches/03_jarjar.diff trunk/cglib/debian/patches/series Removed: trunk/cglib/debian/patches/02_build_split.patch trunk/cglib/debian/patches/series Modified: trunk/cglib/debian/changelog trunk/cglib/debian/control trunk/cglib/debian/rules Log: * d/patches/02_build_split.patch: Drop, re-enable cglib-nodep (Closes: #583231). * d/patches/03_jarjar.diff: fix location of asm.jar. * d/control: Build-Depends on libjarjar-java. * d/control: drop Depends en JRE, as its a library. * d/rules: add jarjar to DEB_JARS. * Bump Standards-Version to 3.9.1 (no changes needed). Modified: trunk/cglib/debian/changelog =================================================================== --- trunk/cglib/debian/changelog 2011-03-06 00:41:08 UTC (rev 13392) +++ trunk/cglib/debian/changelog 2011-03-06 01:01:45 UTC (rev 13393) @@ -1,3 +1,15 @@ +cglib (2.2+dfsg-3) unstable; urgency=low + + * d/patches/02_build_split.patch: Drop, re-enable cglib-nodep + (Closes: #583231). + * d/patches/03_jarjar.diff: fix location of asm.jar. + * d/control: Build-Depends on libjarjar-java. + * d/control: drop Depends en JRE, as its a library. + * d/rules: add jarjar to DEB_JARS. + * Bump Standards-Version to 3.9.1 (no changes needed). + + -- Damien Raude-Morvan <[email protected]> Sun, 06 Mar 2011 01:57:24 +0100 + cglib (2.2+dfsg-2) unstable; urgency=low [ Gabriele Giacone ] Modified: trunk/cglib/debian/control =================================================================== --- trunk/cglib/debian/control 2011-03-06 00:41:08 UTC (rev 13392) +++ trunk/cglib/debian/control 2011-03-06 01:01:45 UTC (rev 13393) @@ -5,15 +5,15 @@ Uploaders: Torsten Werner <[email protected]>, Michael Koch <[email protected]>, Damien Raude-Morvan <[email protected]> Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk, maven-repo-helper -Build-Depends-Indep: libasm3-java, junit -Standards-Version: 3.8.4 +Build-Depends-Indep: libasm3-java, junit, libjarjar-java +Standards-Version: 3.9.1 Homepage: http://cglib.sourceforge.net Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/cglib/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/cglib Package: libcglib-java Architecture: all -Depends: ${misc:Depends}, default-jre-headless | java2-runtime, libasm3-java +Depends: ${misc:Depends}, libasm3-java Conflicts: libcglib2.1-java Provides: libcglib2.1-java Replaces: libcglib2.1-java Deleted: trunk/cglib/debian/patches/02_build_split.patch =================================================================== --- trunk/cglib/debian/patches/02_build_split.patch 2011-03-06 00:41:08 UTC (rev 13392) +++ trunk/cglib/debian/patches/02_build_split.patch 2011-03-06 01:01:45 UTC (rev 13393) @@ -1,39 +0,0 @@ -Description: Split ant targets to get a simple cglib jar without - bundled dependencies. - - jarnodep: simple cglib jar (target used by debian/rules) - - jardep: bundled cglib jar using jarjar tool -Forwarded: not-needed -Author: Arnaud Vandyck <[email protected]> -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2009-10-08 ---- a/build.xml -+++ b/build.xml -@@ -111,19 +111,27 @@ - - <target depends="jar" name="proxy"/> - -- <target depends="compile" description="Create binary distribution" name="jar"> -+ <target depends="jardep,jarnodep" description="Create binary distribution" name="jar"/> -+ -+ <target depends="compile" description="Create binary distribution" name="preparejar"> - <mkdir dir="${dist.home}"/> - <mkdir dir="${build.home}/src"/> - - - <copy file="LICENSE" todir="${build.home}/classes"/> - <copy file="NOTICE" todir="${build.home}/classes"/> -+ </target> - -+ <target depends="preparejar" description="Create binary distribution -+ without dependency" name="jardep"> - <jar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-${component.version}.jar" > - <include name="**/*"/> - <exclude name="samples/**" /> - </jar> -+ </target> - -+ <target depends="preparejar" description="Create binary distribution -+ with dependency" name="jarnodep"> - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/> - <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" > - <zipfileset dir="lib" includes="asm*.txt"/> Added: trunk/cglib/debian/patches/03_jarjar.diff =================================================================== --- trunk/cglib/debian/patches/03_jarjar.diff (rev 0) +++ trunk/cglib/debian/patches/03_jarjar.diff 2011-03-06 01:01:45 UTC (rev 13393) @@ -0,0 +1,11 @@ +--- a/build.xml ++++ b/build.xml +@@ -127,7 +127,7 @@ + <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/> + <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" > + <zipfileset dir="lib" includes="asm*.txt"/> +- <zipfileset src="lib/asm-3.1.jar" excludes="META-INF"/> ++ <zipfileset src="/usr/share/java/asm3-all.jar" excludes="META-INF"/> + <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/> + <include name="**/*"/> + <exclude name="samples/**"/> Deleted: trunk/cglib/debian/patches/series =================================================================== --- trunk/cglib/debian/patches/series 2011-03-06 00:41:08 UTC (rev 13392) +++ trunk/cglib/debian/patches/series 2011-03-06 01:01:45 UTC (rev 13393) @@ -1 +0,0 @@ -02_build_split.patch Added: trunk/cglib/debian/patches/series =================================================================== --- trunk/cglib/debian/patches/series (rev 0) +++ trunk/cglib/debian/patches/series 2011-03-06 01:01:45 UTC (rev 13393) @@ -0,0 +1 @@ +03_jarjar.diff Modified: trunk/cglib/debian/rules =================================================================== --- trunk/cglib/debian/rules 2011-03-06 00:41:08 UTC (rev 13392) +++ trunk/cglib/debian/rules 2011-03-06 01:01:45 UTC (rev 13393) @@ -10,8 +10,8 @@ MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := asm3-attrs asm3 asm3-util junit -DEB_ANT_BUILD_TARGET := jardep javadoc +DEB_JARS := asm3-attrs asm3 asm3-util junit jarjar +DEB_ANT_BUILD_TARGET := jar javadoc DEB_ANT_ARGS += -Dcomponent.version=$(VERSION) JAR_DIR := /usr/share/java @@ -19,6 +19,8 @@ mh_installpom -v -o -e$(VERSION) -plibcglib-java debian/pom.xml; \ mh_installjar -l -i$(VERSION) -plibcglib-java debian/pom.xml \ dist/cglib-$(VERSION).jar; + mh_installjar -l -i$(VERSION) -plibcglib-java -ncglib-nodep debian/pom.xml \ + dist/cglib-nodep-$(VERSION).jar; get-orig-source: uscan --upstream-version 0 --rename _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
