[pkg-java] r16608 - in tags/jarjar: . 1.4+svn142-2/debian 1.4+svn142-2/debian/patches

Damien Raude-Morvan drazzib at alioth.debian.org
Wed May 8 11:13:12 UTC 2013


Author: drazzib
Date: 2013-05-08 11:13:12 +0000 (Wed, 08 May 2013)
New Revision: 16608

Added:
   tags/jarjar/1.4+svn142-2/
   tags/jarjar/1.4+svn142-2/debian/changelog
   tags/jarjar/1.4+svn142-2/debian/control
   tags/jarjar/1.4+svn142-2/debian/patches/add_ClassReader_EXPAND_FRAMES.diff
   tags/jarjar/1.4+svn142-2/debian/patches/series
Removed:
   tags/jarjar/1.4+svn142-2/debian/changelog
   tags/jarjar/1.4+svn142-2/debian/control
   tags/jarjar/1.4+svn142-2/debian/patches/series
Log:
[svn-buildpackage] Tagging jarjar 1.4+svn142-2

Deleted: tags/jarjar/1.4+svn142-2/debian/changelog
===================================================================
--- trunk/jarjar/debian/changelog	2013-05-07 19:54:00 UTC (rev 16605)
+++ tags/jarjar/1.4+svn142-2/debian/changelog	2013-05-08 11:13:12 UTC (rev 16608)
@@ -1,168 +0,0 @@
-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-2/debian/changelog (from rev 16607, trunk/jarjar/debian/changelog)
===================================================================
--- tags/jarjar/1.4+svn142-2/debian/changelog	                        (rev 0)
+++ tags/jarjar/1.4+svn142-2/debian/changelog	2013-05-08 11:13:12 UTC (rev 16608)
@@ -0,0 +1,177 @@
+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-2/debian/control
===================================================================
--- trunk/jarjar/debian/control	2013-05-07 19:54:00 UTC (rev 16605)
+++ tags/jarjar/1.4+svn142-2/debian/control	2013-05-08 11:13:12 UTC (rev 16608)
@@ -1,39 +0,0 @@
-Source: jarjar
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Niels Thykier <niels at thykier.net>,
-           Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, libasm4-java (>= 4.1-2)
-Standards-Version: 3.9.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jarjar
-Vcs-Browser: http://svn.debian.org/wsvn/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-2/debian/control (from rev 16607, trunk/jarjar/debian/control)
===================================================================
--- tags/jarjar/1.4+svn142-2/debian/control	                        (rev 0)
+++ tags/jarjar/1.4+svn142-2/debian/control	2013-05-08 11:13:12 UTC (rev 16608)
@@ -0,0 +1,39 @@
+Source: jarjar
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Niels Thykier <niels at thykier.net>,
+           Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, libasm4-java (>= 4.1-2)
+Standards-Version: 3.9.4
+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-2/debian/patches/add_ClassReader_EXPAND_FRAMES.diff (from rev 16607, trunk/jarjar/debian/patches/add_ClassReader_EXPAND_FRAMES.diff)
===================================================================
--- tags/jarjar/1.4+svn142-2/debian/patches/add_ClassReader_EXPAND_FRAMES.diff	                        (rev 0)
+++ tags/jarjar/1.4+svn142-2/debian/patches/add_ClassReader_EXPAND_FRAMES.diff	2013-05-08 11:13:12 UTC (rev 16608)
@@ -0,0 +1,16 @@
+Description: Resolving dependencies with find, and possibly other tasks, report errors
+ caused by the above missing flag.
+Author: Panayiotis Karabassis <panayk at gmail.com>
+Last-Update: 2011-10-06
+Forwarded: https://code.google.com/p/jarjar/issues/detail?id=6
+--- a/src/main/com/tonicsystems/jarjar/DepFind.java
++++ b/src/main/com/tonicsystems/jarjar/DepFind.java
+@@ -62,7 +62,7 @@
+                 try {
+                   new ClassReader(in).accept(
+                       new DepFindVisitor(classes, entry.getSource(), handler),
+-                      ClassReader.SKIP_DEBUG);
++                      ClassReader.SKIP_DEBUG | ClassReader.EXPAND_FRAMES);
+                 } catch (Exception e) {
+                   System.err.println("Error reading " + entry.getName() + ": " + e.getMessage());
+                 } finally {

Deleted: tags/jarjar/1.4+svn142-2/debian/patches/series
===================================================================
--- trunk/jarjar/debian/patches/series	2013-05-07 19:54:00 UTC (rev 16605)
+++ tags/jarjar/1.4+svn142-2/debian/patches/series	2013-05-08 11:13:12 UTC (rev 16608)
@@ -1,3 +0,0 @@
-0001-fix-build.xml.patch
-0002-embed-libs-from-debian.patch
-szzepiq_jar_resources.diff

Copied: tags/jarjar/1.4+svn142-2/debian/patches/series (from rev 16607, trunk/jarjar/debian/patches/series)
===================================================================
--- tags/jarjar/1.4+svn142-2/debian/patches/series	                        (rev 0)
+++ tags/jarjar/1.4+svn142-2/debian/patches/series	2013-05-08 11:13:12 UTC (rev 16608)
@@ -0,0 +1,4 @@
+0001-fix-build.xml.patch
+0002-embed-libs-from-debian.patch
+szzepiq_jar_resources.diff
+add_ClassReader_EXPAND_FRAMES.diff




More information about the pkg-java-commits mailing list