Author: drazzib Date: 2012-04-01 16:53:23 +0000 (Sun, 01 Apr 2012) New Revision: 15885
Added: tags/cglib/2.2.2+dfsg-2/ tags/cglib/2.2.2+dfsg-2/debian/changelog tags/cglib/2.2.2+dfsg-2/debian/control tags/cglib/2.2.2+dfsg-2/debian/copyright tags/cglib/2.2.2+dfsg-2/debian/patches/03_jarjar.diff tags/cglib/2.2.2+dfsg-2/debian/patches/04_dont_use_userhome.diff tags/cglib/2.2.2+dfsg-2/debian/patches/04_skiptests_ParallelSorter.diff tags/cglib/2.2.2+dfsg-2/debian/patches/series Removed: tags/cglib/2.2.2+dfsg-2/debian/changelog tags/cglib/2.2.2+dfsg-2/debian/control tags/cglib/2.2.2+dfsg-2/debian/copyright tags/cglib/2.2.2+dfsg-2/debian/patches/03_jarjar.diff tags/cglib/2.2.2+dfsg-2/debian/patches/04_skiptests_ParallelSorter.diff tags/cglib/2.2.2+dfsg-2/debian/patches/series Log: [svn-buildpackage] Tagging cglib 2.2.2+dfsg-2 Deleted: tags/cglib/2.2.2+dfsg-2/debian/changelog =================================================================== --- trunk/cglib/debian/changelog 2012-03-22 03:37:26 UTC (rev 15869) +++ tags/cglib/2.2.2+dfsg-2/debian/changelog 2012-04-01 16:53:23 UTC (rev 15885) @@ -1,123 +0,0 @@ -cglib (2.2.2+dfsg-1) unstable; urgency=low - - * New upstream release. - * Bump Standards-Version to 3.9.2: no changes needed. - * d/copyright: Use DEP-5 format. - * d/rules: Enable unit testing. - * d/patches/04_skiptests_ParallelSorter.diff: Skip some failing test. - - -- Damien Raude-Morvan <draz...@debian.org> Tue, 01 Nov 2011 22:05:40 +0100 - -cglib (2.2+dfsg-4) unstable; urgency=low - - * d/rules, d/pom-nodep.xml: Install -nodep jar with another artifactId - to avoid conflict in /usr/share/maven-repo (Closes: #617865). - - -- Damien Raude-Morvan <draz...@debian.org> Sat, 12 Mar 2011 02:03:14 +0100 - -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 <draz...@debian.org> Sun, 06 Mar 2011 01:57:24 +0100 - -cglib (2.2+dfsg-2) unstable; urgency=low - - [ Gabriele Giacone ] - * Added Maven Support - * Standards-Version to 3.8.4 - * Source format 3.0 (quilt) - - [ Damien Raude-Morvan ] - * Remove Arnaud Vandyck from Uploaders - * Source format 3.0 (quilt): - - Remove patchsys-quilt.mk from d/rules - - Rework d/README.source - * Maven Support: - - Add "get-orig-pom" target in d/rules to update pom.xml - * Remove d/README.Debian (already included in d/README.source) - - -- Damien Raude-Morvan <draz...@debian.org> Tue, 16 Mar 2010 20:42:36 +0100 - -cglib (2.2+dfsg-1) unstable; urgency=low - - * New upstream release. - - Rename source package to "cglib" - - Drop unneeded Build-Depends on libaspectwerkz2-java - - Build-Depends on libasm3-java instead of libasm-java - - Drop uneeded debian/patches/01_build_classpath.patch - * Build-Depends on default-jdk instead of default-jdk-builddep - because we don't build a native GCJ package. - * Switch to debhelper 7 - * Use Quilt patch system: - - refresh all debian/patches - - Build-Depends on quilt - - Update debian/README.source - * Update my email address - * Bump Standards-Version to 3.8.3: no changes needed - * Fix debian/copyright to include BSD license of - src/proxy/net/sf/cglib/core/LocalVariablesSorter.java - - -- Damien Raude-Morvan <draz...@debian.org> Thu, 08 Oct 2009 21:23:45 +0200 - -cglib2.1 (2.1.3.dfsg.2-2) unstable; urgency=low - - * Use default-java-builddep: - - Remove B-D on java-gcj-compat-dev (Closes: #526274) - - Add default-java-builddep to B-D - - Use /usr/lib/jvm/default-java as JAVA_HOME - * Move ant to B-D-I (needed for clean target) - * Add myself as Uploaders - * Add ${misc:Depends} as suggested by Lintian - * Fix short-description of libcglib2.1-java-doc - to include "documentation" - * Fix Vcs-* fields to use "cglib2.1" instead of "cglib" - * Bump Standards-Version to 3.8.2: - - Move to "java" section - - Rename README.Debian-source to README.source - - Describe patch system usage in README.source - - -- Damien Raude-Morvan <draz...@drazzib.com> Mon, 29 Jun 2009 22:13:35 +0200 - -cglib2.1 (2.1.3.dfsg.2-1) unstable; urgency=low - - * Increase the upstream version number without changing the actual tarball - to get the package uploaded to main. - - -- Torsten Werner <twer...@debian.org> Sun, 10 Aug 2008 22:32:44 +0200 - -cglib2.1 (2.1.3.dfsg.1-3) unstable; urgency=low - - [ Michael Koch ] - * Use uscan sf.net helper for SourceForge. Fixes upstream checking. - * Added myself to Uploaders. - - [ Torsten Werner ] - * Move package to main. - * Reformat debian/copyright for better readability. - * Do not quote the full text of the Apache License in debian/copyright. - * Fix doc-base file. - - -- Torsten Werner <twer...@debian.org> Thu, 31 Jul 2008 00:18:44 +0200 - -cglib2.1 (2.1.3.dfsg.1-2) unstable; urgency=low - - * Fix debian/watch. - * Add myself to Uploaders. - * Add Homepage and Vcs headers to debian/control. - * Change Standards-Version: 3.7.3. - * Switch to debhelper 5. - - -- Torsten Werner <twer...@debian.org> Mon, 17 Dec 2007 10:47:00 +0100 - -cglib2.1 (2.1.3.dfsg.1-1) unstable; urgency=low - - * Initial Release (closes: #386101). - - -- Arnaud Vandyck <av...@debian.org> Tue, 10 Apr 2007 17:48:55 +0200 Copied: tags/cglib/2.2.2+dfsg-2/debian/changelog (from rev 15884, trunk/cglib/debian/changelog) =================================================================== --- tags/cglib/2.2.2+dfsg-2/debian/changelog (rev 0) +++ tags/cglib/2.2.2+dfsg-2/debian/changelog 2012-04-01 16:53:23 UTC (rev 15885) @@ -0,0 +1,132 @@ +cglib (2.2.2+dfsg-2) unstable; urgency=low + + * Bump Standards-Version to 3.9.3: no changes needed. + * d/control: Remove Michael Koch from Uploaders (Closes: #654001). + * d/patches/04_dont_use_userhome.diff: Don't use $HOME to output debug files. + (Closes: #666668) + + -- Damien Raude-Morvan <draz...@debian.org> Sun, 01 Apr 2012 18:46:48 +0200 + +cglib (2.2.2+dfsg-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.9.2: no changes needed. + * d/copyright: Use DEP-5 format. + * d/rules: Enable unit testing. + * d/patches/04_skiptests_ParallelSorter.diff: Skip some failing test. + + -- Damien Raude-Morvan <draz...@debian.org> Tue, 01 Nov 2011 22:05:40 +0100 + +cglib (2.2+dfsg-4) unstable; urgency=low + + * d/rules, d/pom-nodep.xml: Install -nodep jar with another artifactId + to avoid conflict in /usr/share/maven-repo (Closes: #617865). + + -- Damien Raude-Morvan <draz...@debian.org> Sat, 12 Mar 2011 02:03:14 +0100 + +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 <draz...@debian.org> Sun, 06 Mar 2011 01:57:24 +0100 + +cglib (2.2+dfsg-2) unstable; urgency=low + + [ Gabriele Giacone ] + * Added Maven Support + * Standards-Version to 3.8.4 + * Source format 3.0 (quilt) + + [ Damien Raude-Morvan ] + * Remove Arnaud Vandyck from Uploaders + * Source format 3.0 (quilt): + - Remove patchsys-quilt.mk from d/rules + - Rework d/README.source + * Maven Support: + - Add "get-orig-pom" target in d/rules to update pom.xml + * Remove d/README.Debian (already included in d/README.source) + + -- Damien Raude-Morvan <draz...@debian.org> Tue, 16 Mar 2010 20:42:36 +0100 + +cglib (2.2+dfsg-1) unstable; urgency=low + + * New upstream release. + - Rename source package to "cglib" + - Drop unneeded Build-Depends on libaspectwerkz2-java + - Build-Depends on libasm3-java instead of libasm-java + - Drop uneeded debian/patches/01_build_classpath.patch + * Build-Depends on default-jdk instead of default-jdk-builddep + because we don't build a native GCJ package. + * Switch to debhelper 7 + * Use Quilt patch system: + - refresh all debian/patches + - Build-Depends on quilt + - Update debian/README.source + * Update my email address + * Bump Standards-Version to 3.8.3: no changes needed + * Fix debian/copyright to include BSD license of + src/proxy/net/sf/cglib/core/LocalVariablesSorter.java + + -- Damien Raude-Morvan <draz...@debian.org> Thu, 08 Oct 2009 21:23:45 +0200 + +cglib2.1 (2.1.3.dfsg.2-2) unstable; urgency=low + + * Use default-java-builddep: + - Remove B-D on java-gcj-compat-dev (Closes: #526274) + - Add default-java-builddep to B-D + - Use /usr/lib/jvm/default-java as JAVA_HOME + * Move ant to B-D-I (needed for clean target) + * Add myself as Uploaders + * Add ${misc:Depends} as suggested by Lintian + * Fix short-description of libcglib2.1-java-doc + to include "documentation" + * Fix Vcs-* fields to use "cglib2.1" instead of "cglib" + * Bump Standards-Version to 3.8.2: + - Move to "java" section + - Rename README.Debian-source to README.source + - Describe patch system usage in README.source + + -- Damien Raude-Morvan <draz...@drazzib.com> Mon, 29 Jun 2009 22:13:35 +0200 + +cglib2.1 (2.1.3.dfsg.2-1) unstable; urgency=low + + * Increase the upstream version number without changing the actual tarball + to get the package uploaded to main. + + -- Torsten Werner <twer...@debian.org> Sun, 10 Aug 2008 22:32:44 +0200 + +cglib2.1 (2.1.3.dfsg.1-3) unstable; urgency=low + + [ Michael Koch ] + * Use uscan sf.net helper for SourceForge. Fixes upstream checking. + * Added myself to Uploaders. + + [ Torsten Werner ] + * Move package to main. + * Reformat debian/copyright for better readability. + * Do not quote the full text of the Apache License in debian/copyright. + * Fix doc-base file. + + -- Torsten Werner <twer...@debian.org> Thu, 31 Jul 2008 00:18:44 +0200 + +cglib2.1 (2.1.3.dfsg.1-2) unstable; urgency=low + + * Fix debian/watch. + * Add myself to Uploaders. + * Add Homepage and Vcs headers to debian/control. + * Change Standards-Version: 3.7.3. + * Switch to debhelper 5. + + -- Torsten Werner <twer...@debian.org> Mon, 17 Dec 2007 10:47:00 +0100 + +cglib2.1 (2.1.3.dfsg.1-1) unstable; urgency=low + + * Initial Release (closes: #386101). + + -- Arnaud Vandyck <av...@debian.org> Tue, 10 Apr 2007 17:48:55 +0200 Deleted: tags/cglib/2.2.2+dfsg-2/debian/control =================================================================== --- trunk/cglib/debian/control 2012-03-22 03:37:26 UTC (rev 15869) +++ tags/cglib/2.2.2+dfsg-2/debian/control 2012-04-01 16:53:23 UTC (rev 15885) @@ -1,35 +0,0 @@ -Source: cglib -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Torsten Werner <twer...@debian.org>, - Michael Koch <konque...@gmx.de>, Damien Raude-Morvan <draz...@debian.org> -Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk, maven-repo-helper -Build-Depends-Indep: libasm3-java, junit, libjarjar-java -Standards-Version: 3.9.2 -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}, libasm3-java -Conflicts: libcglib2.1-java -Provides: libcglib2.1-java -Replaces: libcglib2.1-java -Description: code generation library for Java - cglib is a powerful, high performance and quality code generation - library. It is used to extend Java classes and implement interfaces at - run-time. - -Package: libcglib-java-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Suggests: libcglib-java -Description: code generation library for Java - documentation - cglib is a powerful, high performance and quality code generation - library. It is used to extend Java classes and implement interfaces at - run-time. - . - This package includes the documentation. Copied: tags/cglib/2.2.2+dfsg-2/debian/control (from rev 15884, trunk/cglib/debian/control) =================================================================== --- tags/cglib/2.2.2+dfsg-2/debian/control (rev 0) +++ tags/cglib/2.2.2+dfsg-2/debian/control 2012-04-01 16:53:23 UTC (rev 15885) @@ -0,0 +1,35 @@ +Source: cglib +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Uploaders: Torsten Werner <twer...@debian.org>, + Damien Raude-Morvan <draz...@debian.org> +Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, maven-repo-helper +Build-Depends-Indep: junit, libasm3-java, libjarjar-java +Standards-Version: 3.9.3 +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: libasm3-java, ${misc:Depends} +Conflicts: libcglib2.1-java +Provides: libcglib2.1-java +Replaces: libcglib2.1-java +Description: code generation library for Java + cglib is a powerful, high performance and quality code generation + library. It is used to extend Java classes and implement interfaces at + run-time. + +Package: libcglib-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: libcglib-java +Description: code generation library for Java - documentation + cglib is a powerful, high performance and quality code generation + library. It is used to extend Java classes and implement interfaces at + run-time. + . + This package includes the documentation. Deleted: tags/cglib/2.2.2+dfsg-2/debian/copyright =================================================================== --- trunk/cglib/debian/copyright 2012-03-22 03:37:26 UTC (rev 15869) +++ tags/cglib/2.2.2+dfsg-2/debian/copyright 2012-04-01 16:53:23 UTC (rev 15885) @@ -1,56 +0,0 @@ -Format: http://www.debian.org/doc/copyright-format/1.0 -Upstream-Name: CGLib, Code Generation Library -Upstream-Contact: http://cglib.sourceforge.net/ -Source: http://sourceforge.net/projects/cglib/ - -Files: * -Copyright: Copyright (C) 2002-2004 The Apache Software Foundation -License: Apache-2.0 - -Files: debian/* -Copyright: Copyright 2007, Arnaud Vandyck <av...@debian.org> -License: Apache-2.0 - -File: src/proxy/net/sf/cglib/core/LocalVariablesSorter.java -Copyright: Copyright (C) 2000-2005 INRIA, France Telecom -Comment: one source file from the ASM project -License: BSD-3-clauses - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 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. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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. - -License: Apache-2.0 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - The full text of the Apache License can be found in - `/usr/share/common-licenses/Apache-2.0'. \ No newline at end of file Copied: tags/cglib/2.2.2+dfsg-2/debian/copyright (from rev 15884, trunk/cglib/debian/copyright) =================================================================== --- tags/cglib/2.2.2+dfsg-2/debian/copyright (rev 0) +++ tags/cglib/2.2.2+dfsg-2/debian/copyright 2012-04-01 16:53:23 UTC (rev 15885) @@ -0,0 +1,56 @@ +Format: http://www.debian.org/doc/copyright-format/1.0 +Upstream-Name: CGLib, Code Generation Library +Upstream-Contact: http://cglib.sourceforge.net/ +Source: http://sourceforge.net/projects/cglib/ + +Files: * +Copyright: Copyright (C) 2002-2004 The Apache Software Foundation +License: Apache-2.0 + +Files: debian/* +Copyright: Copyright 2007, Arnaud Vandyck <av...@debian.org> +License: Apache-2.0 + +File: src/proxy/net/sf/cglib/core/LocalVariablesSorter.java +Copyright: Copyright (C) 2000-2005 INRIA, France Telecom +Comment: one source file from the ASM project +License: BSD-3-clauses + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 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. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS 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 COPYRIGHT OWNER OR 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. + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + The full text of the Apache License can be found in + `/usr/share/common-licenses/Apache-2.0'. Deleted: tags/cglib/2.2.2+dfsg-2/debian/patches/03_jarjar.diff =================================================================== --- trunk/cglib/debian/patches/03_jarjar.diff 2012-03-22 03:37:26 UTC (rev 15869) +++ tags/cglib/2.2.2+dfsg-2/debian/patches/03_jarjar.diff 2012-04-01 16:53:23 UTC (rev 15885) @@ -1,13 +0,0 @@ -Index: b/build.xml -=================================================================== ---- 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.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/**"/> Copied: tags/cglib/2.2.2+dfsg-2/debian/patches/03_jarjar.diff (from rev 15884, trunk/cglib/debian/patches/03_jarjar.diff) =================================================================== --- tags/cglib/2.2.2+dfsg-2/debian/patches/03_jarjar.diff (rev 0) +++ tags/cglib/2.2.2+dfsg-2/debian/patches/03_jarjar.diff 2012-04-01 16:53:23 UTC (rev 15885) @@ -0,0 +1,16 @@ +Description: Use /usr/share/java/asm3-all.jar to + build a jarjar enabled cglib. +Author: Damien Raude-Morvan <draz...@debian.org> +Last-Update: 2012-04-01 +Forwarded: not-needed +--- 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.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/**"/> Copied: tags/cglib/2.2.2+dfsg-2/debian/patches/04_dont_use_userhome.diff (from rev 15884, trunk/cglib/debian/patches/04_dont_use_userhome.diff) =================================================================== --- tags/cglib/2.2.2+dfsg-2/debian/patches/04_dont_use_userhome.diff (rev 0) +++ tags/cglib/2.2.2+dfsg-2/debian/patches/04_dont_use_userhome.diff 2012-04-01 16:53:23 UTC (rev 15885) @@ -0,0 +1,16 @@ +Description: Don't use user.home to get debug output. +Author: Damien Raude-Morvan <draz...@debian.org> +Last-Update: 2012-04-01 +Forwarded: not-needed + +--- a/build.xml ++++ b/build.xml +@@ -245,7 +245,7 @@ + <!-- <jvmarg value="-verbose:class"/> --> + <!-- <jvmarg value="-Xprof"/> --> + <!-- <jvmarg value="-server"/> --> +- <!-- <sysproperty key="cglib.debugLocation" value="debug"/> --> ++ <sysproperty key="cglib.debugLocation" value="debug"/> + <!-- <jvmarg value="-Djava.security.policy==java.policy" /> --> + <!-- <jvmarg value="-Djava.security.manager" /> --> + Deleted: tags/cglib/2.2.2+dfsg-2/debian/patches/04_skiptests_ParallelSorter.diff =================================================================== --- trunk/cglib/debian/patches/04_skiptests_ParallelSorter.diff 2012-03-22 03:37:26 UTC (rev 15869) +++ tags/cglib/2.2.2+dfsg-2/debian/patches/04_skiptests_ParallelSorter.diff 2012-04-01 16:53:23 UTC (rev 15885) @@ -1,13 +0,0 @@ -Index: b/src/test/net/sf/cglib/TestAll.java -=================================================================== ---- a/src/test/net/sf/cglib/TestAll.java -+++ b/src/test/net/sf/cglib/TestAll.java -@@ -73,7 +73,7 @@ - suite.addTest(TestTinyBitSet.suite()); - - // util -- suite.addTest(TestParallelSorter.suite()); -+ //suite.addTest(TestParallelSorter.suite()); - - // transform - suite.addTest(TestTransformingLoader.suite()); Copied: tags/cglib/2.2.2+dfsg-2/debian/patches/04_skiptests_ParallelSorter.diff (from rev 15884, trunk/cglib/debian/patches/04_skiptests_ParallelSorter.diff) =================================================================== --- tags/cglib/2.2.2+dfsg-2/debian/patches/04_skiptests_ParallelSorter.diff (rev 0) +++ tags/cglib/2.2.2+dfsg-2/debian/patches/04_skiptests_ParallelSorter.diff 2012-04-01 16:53:23 UTC (rev 15885) @@ -0,0 +1,18 @@ +Description: Skip failing tests. +Author: Damien Raude-Morvan <draz...@debian.org> +Last-Update: 2012-04-01 +Forwarded: not-needed + +Index: b/src/test/net/sf/cglib/TestAll.java +=================================================================== +--- a/src/test/net/sf/cglib/TestAll.java ++++ b/src/test/net/sf/cglib/TestAll.java +@@ -73,7 +73,7 @@ + suite.addTest(TestTinyBitSet.suite()); + + // util +- suite.addTest(TestParallelSorter.suite()); ++ //suite.addTest(TestParallelSorter.suite()); + + // transform + suite.addTest(TestTransformingLoader.suite()); Deleted: tags/cglib/2.2.2+dfsg-2/debian/patches/series =================================================================== --- trunk/cglib/debian/patches/series 2012-03-22 03:37:26 UTC (rev 15869) +++ tags/cglib/2.2.2+dfsg-2/debian/patches/series 2012-04-01 16:53:23 UTC (rev 15885) @@ -1,2 +0,0 @@ -03_jarjar.diff -04_skiptests_ParallelSorter.diff Copied: tags/cglib/2.2.2+dfsg-2/debian/patches/series (from rev 15884, trunk/cglib/debian/patches/series) =================================================================== --- tags/cglib/2.2.2+dfsg-2/debian/patches/series (rev 0) +++ tags/cglib/2.2.2+dfsg-2/debian/patches/series 2012-04-01 16:53:23 UTC (rev 15885) @@ -0,0 +1,3 @@ +03_jarjar.diff +04_skiptests_ParallelSorter.diff +04_dont_use_userhome.diff _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits