[pkg-java] r19162 - in tags/jarjar: . 1.4+svn142-6/debian 1.4+svn142-6/debian/patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Oct 10 23:13:20 UTC 2016
Author: ebourg-guest
Date: 2016-10-10 23:13:20 +0000 (Mon, 10 Oct 2016)
New Revision: 19162
Added:
tags/jarjar/1.4+svn142-6/
tags/jarjar/1.4+svn142-6/debian/changelog
tags/jarjar/1.4+svn142-6/debian/control
tags/jarjar/1.4+svn142-6/debian/libjarjar-java.poms
tags/jarjar/1.4+svn142-6/debian/patches/0006-asm-compatibility.patch
tags/jarjar/1.4+svn142-6/debian/patches/series
tags/jarjar/1.4+svn142-6/debian/rules
Removed:
tags/jarjar/1.4+svn142-6/debian/changelog
tags/jarjar/1.4+svn142-6/debian/control
tags/jarjar/1.4+svn142-6/debian/libjarjar-java-doc.doc-base
tags/jarjar/1.4+svn142-6/debian/libjarjar-java-doc.install
tags/jarjar/1.4+svn142-6/debian/patches/series
tags/jarjar/1.4+svn142-6/debian/rules
Log:
[svn-buildpackage] Tagging jarjar 1.4+svn142-6
Deleted: tags/jarjar/1.4+svn142-6/debian/changelog
===================================================================
--- trunk/jarjar/debian/changelog 2016-10-03 14:36:22 UTC (rev 19152)
+++ tags/jarjar/1.4+svn142-6/debian/changelog 2016-10-10 23:13:20 UTC (rev 19162)
@@ -1,207 +0,0 @@
-jarjar (1.4+svn142-5) unstable; urgency=medium
-
- * Team upload.
- * Depend on libasm-java (>= 5.0) instead of libasm4-java
- * Removed Niels Thykier from the uploaders (Closes: #770567)
- * Standards-Version updated to 3.9.8
- * Switch to debhelper level 9
-
- -- Emmanuel Bourg <ebourg at apache.org> Mon, 03 Oct 2016 15:10:59 +0200
-
-jarjar (1.4+svn142-4) unstable; urgency=low
-
- * Add myself to Uploaders.
- * Remove szzepiq_jar_resources.diff patch. (Closes: #745815).
- * Add B-D on libmaven2-core-java.
- * Bump Standards-Version to 3.9.5. No changes were required.
- * Remove outdated readme d/README.Debian.
- * Remove outdated patch d/patches/0001-fix-build.xml.patch.
- * Add patch d/patches/0005-fix-javadocs.patch to fix some
- warnings during javadoc generation.
-
- -- Miguel Landaeta <nomadium at debian.org> Sun, 04 May 2014 20:30:37 -0300
-
-jarjar (1.4+svn142-3) unstable; urgency=low
-
- * Team upload.
- * Provide Maven artifacts. (Closes: #727652).
-
- -- Miguel Landaeta <miguel at miguel.cc> Thu, 24 Oct 2013 21:26:09 -0300
-
-jarjar (1.4+svn142-2) unstable; urgency=low
-
- * Upload to unstable.
- * d/control: Use canonical URL for Vcs-* fields.
- * d/patches/add_ClassReader_EXPAND_FRAMES.diff: Add missing
- ClassReader.EXPAND_FRAMES for ASM call (Closes: #644469).
-
- -- Damien Raude-Morvan <drazzib at debian.org> Tue, 07 May 2013 23:29:00 +0200
-
-jarjar (1.4+svn142-1) experimental; urgency=low
-
- * New upstream release.
- * Add myself as Uploaders.
- * Use ASM 4.x for bytecode processing:
- - d/control: Build-Depends on libasm4-java.
- - d/rules: Update CLASSPATH.
- - d/ant.properties: Use asm4.jar and asm4-commons.jar.
- * d/watch: Update to check on googlecode.com
- * Update Standards-Version: 3.9.4, no changes needed.
- * d/patches/szzepiq_jar_resources.diff:
- From <URL:https://github.com/szczepiq/jarjar>, resolve the issue with
- jarjar not updating the fully qualified class names in the jar's resources
- * d/patches/0003-fix-path-in-build.xml.patch,
- d/patches/0004-support-gnu-regexp.patch,
- d/patches/0005-cast-null-to-java.io.File.patch: Dropped, as only needed
- from old GCJ runtime.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Mon, 07 Jan 2013 23:46:03 +0100
-
-jarjar (1.1-3) unstable; urgency=low
-
- * Rember to actually remove Michael Koch from uploaders.
-
- -- Niels Thykier <niels at thykier.net> Sun, 15 Jul 2012 13:19:13 +0200
-
-jarjar (1.1-2) unstable; urgency=low
-
- [ James Page ]
- * Drop debian/patches/0006-remove-asm-commons-from-final-jar.patch:
- libasm3-java now ships correctly separated jar files so asm-commons
- must be included. (Closes: #646600)
-
- [ Niels Thykier ]
- * Remove Michael Koch from uploaders. Thanks for your work so far.
- (Closes: #654028)
-
- -- Niels Thykier <niels at thykier.net> Sun, 15 Jul 2012 12:42:56 +0200
-
-jarjar (1.1-1) unstable; urgency=low
-
- * Team upload
- * New upstream release.
- * Change debian/watch to point to upstream's svn repo.
- * Refresh patches.
- * Remove Arnaud from Uploaders list.
- * Remove Java runtime from Depends.
- * Update Standards-Version: 3.9.2.
-
- -- Torsten Werner <twerner at debian.org> Thu, 08 Sep 2011 22:30:41 +0200
-
-jarjar (1.0+dfsg-2) unstable; urgency=low
-
- [ Torsten Werner ]
- * Convert patches to dep3 format.
- * Add a patch to cast null to java.io.File. (Closes: #571340)
- * Add a patch to remove asm-commons from final jar file.
- * Convert package to source format 3.0.
-
- [ Thierry Carrez ]
- * debian/control: Minimal runtime dependency set to java2-runtime-headless
-
- [ Niels Thykier ]
- * debian/control: Added java5 and java6 as alternatives.
-
- -- Torsten Werner <twerner at debian.org> Sun, 28 Feb 2010 12:47:45 +0100
-
-jarjar (1.0+dfsg-1) unstable; urgency=low
-
- [ Michael Koch ]
- * debian/watch: updated to track binary jar file instead
- of source release.
-
- [ Niels Thykier ]
- * New upstream release.
- - Identical content, but version numbers differed.
- * Create a script to handle fetching of orig source that
- works around 1.0rc8 and 1.0 being the same release.
-
- -- Niels Thykier <niels at thykier.net> Mon, 14 Sep 2009 21:39:52 +0200
-
-jarjar (1.0~rc8+dfsg-1) unstable; urgency=low
-
- * New upstream release.
- * Added myself to uploaders.
- * Renamed and updated 02_dont_build_JarJarMojo.patch to
- 02_fix_build_xml.patch.
- * Stopped using Build-Depends-Indep since buildds and the policy
- does not agree on when it should used.
- * Changed section to java.
- * Replaced gcj-compat with the default javas packages.
- (Closes: #526279)
- * Bumped to Standard-Version 3.8.3.
- - Link to Apache-2.0 license rather than quoting it.
- * Bumped Debhelper to version 7.
- * Added a README.source to briefly explain that files have been
- excluded from the orignal upstream source.
- * Created an get-orig-source rule to fetch and create the
- orig.tar.gz.
-
- -- Niels Thykier <niels at thykier.net> Sat, 12 Sep 2009 19:26:57 +0200
-
-jarjar (1.0~rc7.dfsg-2) unstable; urgency=low
-
- * Fix lists in long descriptions. Closes: #480324
-
- -- Michael Koch <konqueror at gmx.de> Fri, 09 May 2008 17:13:34 -0100
-
-jarjar (1.0~rc7.dfsg-1) unstable; urgency=low
-
- * New upstream version.
- * Updated watch file again to check for source download.
-
- -- Michael Koch <konqueror at gmx.de> Sat, 22 Mar 2008 17:23:24 +0100
-
-jarjar (1.0~rc6.dfsg-1) unstable; urgency=low
-
- [ Michael Koch ]
- * Rewrote debian/copyright as new version is licensed under
- Apache License 2.0.
- * Updated watch file to match upstream version correctly.
- * Moved debhelper and cdbs from Build-Depends-Indep to Build-Depends.
- * Updated debhelper level to 5.
- * Added debian/patches/05_gnu_regexp.patch to work around limitation in
- gnu.regexp.
- * Removed some cruft from debian/rules.
- * Added Homepage, Vcs-Svn and Vcs-Browser fields.
- * Added myself to Uploaders.
-
- [ Arnaud Vandyck ]
- * New upstream.
- * debian/control:
- - Standards-Version: updated to 3.7.3, no change.
- - Build-Depends-Indep: removed libgnu-regexp-java.
- * debian/patches/19_TextDepHandler.patch,
- debian/patches/22_util_StandaloneJarProcessor.patch,
- debian/patches/23_KeepProcessor.patch,
- debian/patches/10_DepFindVisitor.patch,
- debian/patches/21_util_RemappingClassTransformer.patch,
- debian/patches/14_PackageRemapper.patch,
- debian/patches/12_JarJarTask.patch,
- debian/patches/17_ResourceProcessor.patch,
- debian/patches/20_util_ClassHeaderReader.patch,
- debian/patches/01_build_classpath.patch,
- debian/patches/18_StringReader.patch,
- debian/patches/15_util_JarTransformerChain.patch,
- debian/patches/24_util_GetNameClassWriter.patch,
- debian/patches/13_ManifestProcessor.patch,
- debian/patches/11_DepFind.patch,
- debian/patches/10_AbstractDepHandler_warning.patch: removed
- * debian/patches/04_path_build.patch: added
- * debian/libjarjar-java.install, debian/libjarjar-java.links: updated to
- new upstream
- * debian/patches/03_embed_libs_from_debian.patch: updated to match
- upstream change and removed reference to libgnu-regexp-java
- * debian/ant.properties: removed reference to libgnu-regexp-java and
- commented maven-plugin-api property
- * debian/rules:
- - removed reference to libgnu-regexp-java and ams3-util
- - removed clean comments
-
- -- Michael Koch <konqueror at gmx.de> Wed, 20 Feb 2008 21:11:44 +0100
-
-jarjar (1.0~rc3.dfsg.1-1) unstable; urgency=low
-
- * Initial Release (closes: #417591).
-
- -- Arnaud Vandyck <avdyk at debian.org> Fri, 18 May 2007 13:09:08 +0200
Copied: tags/jarjar/1.4+svn142-6/debian/changelog (from rev 19158, trunk/jarjar/debian/changelog)
===================================================================
--- tags/jarjar/1.4+svn142-6/debian/changelog (rev 0)
+++ tags/jarjar/1.4+svn142-6/debian/changelog 2016-10-10 23:13:20 UTC (rev 19162)
@@ -0,0 +1,217 @@
+jarjar (1.4+svn142-6) unstable; urgency=medium
+
+ * Team upload.
+ * Include the SignatureRemapper class (new in ASM 5.1) in the final jar
+ * Build with the DH sequencer instead of CDBS
+ * Added a Built-Using field with the asm version used
+ * Removed the -java-doc package
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 05 Oct 2016 10:29:15 +0200
+
+jarjar (1.4+svn142-5) unstable; urgency=medium
+
+ * Team upload.
+ * Depend on libasm-java (>= 5.0) instead of libasm4-java
+ * Removed Niels Thykier from the uploaders (Closes: #770567)
+ * Standards-Version updated to 3.9.8
+ * Switch to debhelper level 9
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 03 Oct 2016 15:10:59 +0200
+
+jarjar (1.4+svn142-4) unstable; urgency=low
+
+ * Add myself to Uploaders.
+ * Remove szzepiq_jar_resources.diff patch. (Closes: #745815).
+ * Add B-D on libmaven2-core-java.
+ * Bump Standards-Version to 3.9.5. No changes were required.
+ * Remove outdated readme d/README.Debian.
+ * Remove outdated patch d/patches/0001-fix-build.xml.patch.
+ * Add patch d/patches/0005-fix-javadocs.patch to fix some
+ warnings during javadoc generation.
+
+ -- Miguel Landaeta <nomadium at debian.org> Sun, 04 May 2014 20:30:37 -0300
+
+jarjar (1.4+svn142-3) unstable; urgency=low
+
+ * Team upload.
+ * Provide Maven artifacts. (Closes: #727652).
+
+ -- Miguel Landaeta <miguel at miguel.cc> Thu, 24 Oct 2013 21:26:09 -0300
+
+jarjar (1.4+svn142-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * d/control: Use canonical URL for Vcs-* fields.
+ * d/patches/add_ClassReader_EXPAND_FRAMES.diff: Add missing
+ ClassReader.EXPAND_FRAMES for ASM call (Closes: #644469).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 07 May 2013 23:29:00 +0200
+
+jarjar (1.4+svn142-1) experimental; urgency=low
+
+ * New upstream release.
+ * Add myself as Uploaders.
+ * Use ASM 4.x for bytecode processing:
+ - d/control: Build-Depends on libasm4-java.
+ - d/rules: Update CLASSPATH.
+ - d/ant.properties: Use asm4.jar and asm4-commons.jar.
+ * d/watch: Update to check on googlecode.com
+ * Update Standards-Version: 3.9.4, no changes needed.
+ * d/patches/szzepiq_jar_resources.diff:
+ From <URL:https://github.com/szczepiq/jarjar>, resolve the issue with
+ jarjar not updating the fully qualified class names in the jar's resources
+ * d/patches/0003-fix-path-in-build.xml.patch,
+ d/patches/0004-support-gnu-regexp.patch,
+ d/patches/0005-cast-null-to-java.io.File.patch: Dropped, as only needed
+ from old GCJ runtime.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Mon, 07 Jan 2013 23:46:03 +0100
+
+jarjar (1.1-3) unstable; urgency=low
+
+ * Rember to actually remove Michael Koch from uploaders.
+
+ -- Niels Thykier <niels at thykier.net> Sun, 15 Jul 2012 13:19:13 +0200
+
+jarjar (1.1-2) unstable; urgency=low
+
+ [ James Page ]
+ * Drop debian/patches/0006-remove-asm-commons-from-final-jar.patch:
+ libasm3-java now ships correctly separated jar files so asm-commons
+ must be included. (Closes: #646600)
+
+ [ Niels Thykier ]
+ * Remove Michael Koch from uploaders. Thanks for your work so far.
+ (Closes: #654028)
+
+ -- Niels Thykier <niels at thykier.net> Sun, 15 Jul 2012 12:42:56 +0200
+
+jarjar (1.1-1) unstable; urgency=low
+
+ * Team upload
+ * New upstream release.
+ * Change debian/watch to point to upstream's svn repo.
+ * Refresh patches.
+ * Remove Arnaud from Uploaders list.
+ * Remove Java runtime from Depends.
+ * Update Standards-Version: 3.9.2.
+
+ -- Torsten Werner <twerner at debian.org> Thu, 08 Sep 2011 22:30:41 +0200
+
+jarjar (1.0+dfsg-2) unstable; urgency=low
+
+ [ Torsten Werner ]
+ * Convert patches to dep3 format.
+ * Add a patch to cast null to java.io.File. (Closes: #571340)
+ * Add a patch to remove asm-commons from final jar file.
+ * Convert package to source format 3.0.
+
+ [ Thierry Carrez ]
+ * debian/control: Minimal runtime dependency set to java2-runtime-headless
+
+ [ Niels Thykier ]
+ * debian/control: Added java5 and java6 as alternatives.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 28 Feb 2010 12:47:45 +0100
+
+jarjar (1.0+dfsg-1) unstable; urgency=low
+
+ [ Michael Koch ]
+ * debian/watch: updated to track binary jar file instead
+ of source release.
+
+ [ Niels Thykier ]
+ * New upstream release.
+ - Identical content, but version numbers differed.
+ * Create a script to handle fetching of orig source that
+ works around 1.0rc8 and 1.0 being the same release.
+
+ -- Niels Thykier <niels at thykier.net> Mon, 14 Sep 2009 21:39:52 +0200
+
+jarjar (1.0~rc8+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added myself to uploaders.
+ * Renamed and updated 02_dont_build_JarJarMojo.patch to
+ 02_fix_build_xml.patch.
+ * Stopped using Build-Depends-Indep since buildds and the policy
+ does not agree on when it should used.
+ * Changed section to java.
+ * Replaced gcj-compat with the default javas packages.
+ (Closes: #526279)
+ * Bumped to Standard-Version 3.8.3.
+ - Link to Apache-2.0 license rather than quoting it.
+ * Bumped Debhelper to version 7.
+ * Added a README.source to briefly explain that files have been
+ excluded from the orignal upstream source.
+ * Created an get-orig-source rule to fetch and create the
+ orig.tar.gz.
+
+ -- Niels Thykier <niels at thykier.net> Sat, 12 Sep 2009 19:26:57 +0200
+
+jarjar (1.0~rc7.dfsg-2) unstable; urgency=low
+
+ * Fix lists in long descriptions. Closes: #480324
+
+ -- Michael Koch <konqueror at gmx.de> Fri, 09 May 2008 17:13:34 -0100
+
+jarjar (1.0~rc7.dfsg-1) unstable; urgency=low
+
+ * New upstream version.
+ * Updated watch file again to check for source download.
+
+ -- Michael Koch <konqueror at gmx.de> Sat, 22 Mar 2008 17:23:24 +0100
+
+jarjar (1.0~rc6.dfsg-1) unstable; urgency=low
+
+ [ Michael Koch ]
+ * Rewrote debian/copyright as new version is licensed under
+ Apache License 2.0.
+ * Updated watch file to match upstream version correctly.
+ * Moved debhelper and cdbs from Build-Depends-Indep to Build-Depends.
+ * Updated debhelper level to 5.
+ * Added debian/patches/05_gnu_regexp.patch to work around limitation in
+ gnu.regexp.
+ * Removed some cruft from debian/rules.
+ * Added Homepage, Vcs-Svn and Vcs-Browser fields.
+ * Added myself to Uploaders.
+
+ [ Arnaud Vandyck ]
+ * New upstream.
+ * debian/control:
+ - Standards-Version: updated to 3.7.3, no change.
+ - Build-Depends-Indep: removed libgnu-regexp-java.
+ * debian/patches/19_TextDepHandler.patch,
+ debian/patches/22_util_StandaloneJarProcessor.patch,
+ debian/patches/23_KeepProcessor.patch,
+ debian/patches/10_DepFindVisitor.patch,
+ debian/patches/21_util_RemappingClassTransformer.patch,
+ debian/patches/14_PackageRemapper.patch,
+ debian/patches/12_JarJarTask.patch,
+ debian/patches/17_ResourceProcessor.patch,
+ debian/patches/20_util_ClassHeaderReader.patch,
+ debian/patches/01_build_classpath.patch,
+ debian/patches/18_StringReader.patch,
+ debian/patches/15_util_JarTransformerChain.patch,
+ debian/patches/24_util_GetNameClassWriter.patch,
+ debian/patches/13_ManifestProcessor.patch,
+ debian/patches/11_DepFind.patch,
+ debian/patches/10_AbstractDepHandler_warning.patch: removed
+ * debian/patches/04_path_build.patch: added
+ * debian/libjarjar-java.install, debian/libjarjar-java.links: updated to
+ new upstream
+ * debian/patches/03_embed_libs_from_debian.patch: updated to match
+ upstream change and removed reference to libgnu-regexp-java
+ * debian/ant.properties: removed reference to libgnu-regexp-java and
+ commented maven-plugin-api property
+ * debian/rules:
+ - removed reference to libgnu-regexp-java and ams3-util
+ - removed clean comments
+
+ -- Michael Koch <konqueror at gmx.de> Wed, 20 Feb 2008 21:11:44 +0100
+
+jarjar (1.0~rc3.dfsg.1-1) unstable; urgency=low
+
+ * Initial Release (closes: #417591).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Fri, 18 May 2007 13:09:08 +0200
Deleted: tags/jarjar/1.4+svn142-6/debian/control
===================================================================
--- trunk/jarjar/debian/control 2016-10-03 14:36:22 UTC (rev 19152)
+++ tags/jarjar/1.4+svn142-6/debian/control 2016-10-10 23:13:20 UTC (rev 19162)
@@ -1,40 +0,0 @@
-Source: jarjar
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
- Miguel Landaeta <nomadium at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, libasm-java (>= 5.0),
- maven-repo-helper, libmaven2-core-java
-Standards-Version: 3.9.8
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jarjar
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jarjar
-Homepage: http://code.google.com/p/jarjar/
-
-Package: libjarjar-java
-Architecture: all
-Depends: ${misc:Depends}
-Description: repackage third-party jars
- Utility that makes it easy to repackage Java libraries and embed them
- into your own distribution. This is useful for two reasons:
- .
- - You can easily ship a single jar file with no external dependencies.
- - You can avoid problems where your library depends on a specific
- version of a library, which may conflict with the dependencies of
- another library.
-
-Package: libjarjar-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: libjarjar-java
-Description: repackage third-party jars - documentation
- Utility that makes it easy to repackage Java libraries and embed them
- into your own distribution. This is useful for two reasons:
- .
- - You can easily ship a single jar file with no external dependencies.
- - You can avoid problems where your library depends on a specific
- version of a library, which may conflict with the dependencies of
- another library.
- .
- This package includes the documentation.
Copied: tags/jarjar/1.4+svn142-6/debian/control (from rev 19157, trunk/jarjar/debian/control)
===================================================================
--- tags/jarjar/1.4+svn142-6/debian/control (rev 0)
+++ tags/jarjar/1.4+svn142-6/debian/control 2016-10-10 23:13:20 UTC (rev 19162)
@@ -0,0 +1,25 @@
+Source: jarjar
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>,
+ Miguel Landaeta <nomadium at debian.org>
+Build-Depends: ant, debhelper (>= 9), default-jdk, libasm-java (>= 5.0),
+ maven-repo-helper, libmaven2-core-java
+Standards-Version: 3.9.8
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jarjar
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jarjar
+Homepage: http://code.google.com/p/jarjar/
+
+Package: libjarjar-java
+Architecture: all
+Depends: ${misc:Depends}
+Built-Using: asm (= ${asm:Version})
+Description: repackage third-party jars
+ Utility that makes it easy to repackage Java libraries and embed them
+ into your own distribution. This is useful for two reasons:
+ .
+ - You can easily ship a single jar file with no external dependencies.
+ - You can avoid problems where your library depends on a specific
+ version of a library, which may conflict with the dependencies of
+ another library.
Deleted: tags/jarjar/1.4+svn142-6/debian/libjarjar-java-doc.doc-base
===================================================================
--- trunk/jarjar/debian/libjarjar-java-doc.doc-base 2016-10-03 14:36:22 UTC (rev 19152)
+++ tags/jarjar/1.4+svn142-6/debian/libjarjar-java-doc.doc-base 2016-10-10 23:13:20 UTC (rev 19162)
@@ -1,10 +0,0 @@
-Document: jarjar-doc
-Title: Programmer API for jarjar (repackage third-party jars)
-Author: Chris Nokleberg
-Abstract: This is the programmer API of jarjar, a library for repackaging
- third-party jars.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjarjar-java-doc/api/index.html
-Files: /usr/share/doc/libjarjar-java-doc/api/*.html
Deleted: tags/jarjar/1.4+svn142-6/debian/libjarjar-java-doc.install
===================================================================
--- trunk/jarjar/debian/libjarjar-java-doc.install 2016-10-03 14:36:22 UTC (rev 19152)
+++ tags/jarjar/1.4+svn142-6/debian/libjarjar-java-doc.install 2016-10-10 23:13:20 UTC (rev 19162)
@@ -1 +0,0 @@
-dist/javadoc/* /usr/share/doc/libjarjar-java-doc/api
Copied: tags/jarjar/1.4+svn142-6/debian/libjarjar-java.poms (from rev 19155, trunk/jarjar/debian/libjarjar-java.poms)
===================================================================
--- tags/jarjar/1.4+svn142-6/debian/libjarjar-java.poms (rev 0)
+++ tags/jarjar/1.4+svn142-6/debian/libjarjar-java.poms 2016-10-10 23:13:20 UTC (rev 19162)
@@ -0,0 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --no-parent --java-lib --set-version=1.4 --artifact=dist/jarjar-*.jar
Copied: tags/jarjar/1.4+svn142-6/debian/patches/0006-asm-compatibility.patch (from rev 19154, trunk/jarjar/debian/patches/0006-asm-compatibility.patch)
===================================================================
--- tags/jarjar/1.4+svn142-6/debian/patches/0006-asm-compatibility.patch (rev 0)
+++ tags/jarjar/1.4+svn142-6/debian/patches/0006-asm-compatibility.patch 2016-10-10 23:13:20 UTC (rev 19162)
@@ -0,0 +1,15 @@
+Description: Fixes the compatibility with the latest version of ASM.
+ Starting with ASM 5.1 the SignatureRemapper class must be included.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -97,7 +97,7 @@
+ <fileset dir="build/main"/>
+ <zipfileset src="${asm.jar}"/>
+ <zipfileset src="${asm-commons.jar}">
+- <include name="org/objectweb/asm/commons/Remap*.class"/>
++ <include name="org/objectweb/asm/commons/*Remap*.class"/>
+ <include name="org/objectweb/asm/commons/LocalVariablesSorter.class"/>
+ </zipfileset>
+ <keep pattern="com.tonicsystems.jarjar.Main"/>
Deleted: tags/jarjar/1.4+svn142-6/debian/patches/series
===================================================================
--- trunk/jarjar/debian/patches/series 2016-10-03 14:36:22 UTC (rev 19152)
+++ tags/jarjar/1.4+svn142-6/debian/patches/series 2016-10-10 23:13:20 UTC (rev 19162)
@@ -1,5 +0,0 @@
-0002-embed-libs-from-debian.patch
-# please see #745815 before re-enabling this patch
-#szzepiq_jar_resources.diff
-add_ClassReader_EXPAND_FRAMES.diff
-0005-fix-javadocs.patch
Copied: tags/jarjar/1.4+svn142-6/debian/patches/series (from rev 19153, trunk/jarjar/debian/patches/series)
===================================================================
--- tags/jarjar/1.4+svn142-6/debian/patches/series (rev 0)
+++ tags/jarjar/1.4+svn142-6/debian/patches/series 2016-10-10 23:13:20 UTC (rev 19162)
@@ -0,0 +1,6 @@
+0002-embed-libs-from-debian.patch
+# please see #745815 before re-enabling this patch
+#szzepiq_jar_resources.diff
+add_ClassReader_EXPAND_FRAMES.diff
+0005-fix-javadocs.patch
+0006-asm-compatibility.patch
Deleted: tags/jarjar/1.4+svn142-6/debian/rules
===================================================================
--- trunk/jarjar/debian/rules 2016-10-03 14:36:22 UTC (rev 19152)
+++ tags/jarjar/1.4+svn142-6/debian/rules 2016-10-10 23:13:20 UTC (rev 19162)
@@ -1,23 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-VERSION=`echo $(DEB_UPSTREAM_VERSION) | sed -e s/~// | sed -e s/\.dfsg//`
-MAVEN_VERSION := $(shell echo $(VERSION) | sed -e 's/+svn.*/-SNAPSHOT/')
-
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_JARS := asm asm-commons maven-plugin-api
-DEB_ANT_BUILD_TARGET := jar javadoc
-
-install/libjarjar-java::
- # versioning workaround until 1.4 is released
- mh_installpom -plibjarjar-java --no-parent --set-version=$(MAVEN_VERSION) pom.xml
- mh_installjar -plibjarjar-java -l pom.xml --set-version=$(MAVEN_VERSION) dist/jarjar-*.jar
-
-clean::
- mh_clean
-
-get-orig-source:
- debian/orig-tar.sh --release $(DEB_UPSTREAM_VERSION)
Copied: tags/jarjar/1.4+svn142-6/debian/rules (from rev 19157, trunk/jarjar/debian/rules)
===================================================================
--- tags/jarjar/1.4+svn142-6/debian/rules (rev 0)
+++ tags/jarjar/1.4+svn142-6/debian/rules 2016-10-10 23:13:20 UTC (rev 19162)
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+export CLASSPATH := /usr/share/java/asm.jar:/usr/share/java/asm-commons.jar:/usr/share/java/maven-plugin-api.jar
+
+# Variable for the Built-Using field in the control file
+ASM_VERSION := $(shell dpkg-query -f '$${source:Version}' --show libasm-java)
+
+%:
+ dh $@ --with maven-repo-helper
+
+override_dh_gencontrol:
+ dh_gencontrol -- -Vasm:Version=${ASM_VERSION}
+
+override_dh_auto_clean:
+ dh_auto_clean
+ dh_auto_build -- clean
+
+get-orig-source:
+ uscan --download-current-version --force-download
More information about the pkg-java-commits
mailing list