[pkg-java] r17763 - trunk/cglib/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-02-11 12:19:19 +0000 (Tue, 11 Feb 2014)
New Revision: 17763

Modified:
   trunk/cglib/debian/changelog
   trunk/cglib/debian/control
   trunk/cglib/debian/copyright
   trunk/cglib/debian/orig-tar.sh
Log:
Proper copyright attribution for asm (Closes: #738583)
Use XZ compression for the upstream tarball



Modified: trunk/cglib/debian/changelog
===================================================================
--- trunk/cglib/debian/changelog	2014-02-11 11:10:20 UTC (rev 17762)
+++ trunk/cglib/debian/changelog	2014-02-11 12:19:19 UTC (rev 17763)
@@ -1,6 +1,10 @@
-cglib (2.2.2+dfsg-6) UNRELEASED; urgency=medium
+cglib (2.2.2+dfsg2-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Proper copyright attribution for asm (Closes: #738583)
+    - Built-Using: libasm3-java added to debian/control
+    - Missing asm license file added to cglib-nodep.jar
+    - Note added to debian/copyright to mention the inclusion of asm
   * debian/control:
     - Use canonical URLs for the Vcs-* fields
     - Standards-Version updated to 3.9.5 (no changes) 
@@ -9,6 +13,7 @@
   * debian/copyright: Fixed a typo
   * debian/watch: Match only the 2.x releases (cglib 3 is packaged in
     libcglib3-java)
+  * Use XZ compression for the upstream tarball
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 11 Feb 2014 11:28:10 +0100
 

Modified: trunk/cglib/debian/control
===================================================================
--- trunk/cglib/debian/control	2014-02-11 11:10:20 UTC (rev 17762)
+++ trunk/cglib/debian/control	2014-02-11 12:19:19 UTC (rev 17763)
@@ -14,6 +14,7 @@
 Package: libcglib-java
 Architecture: all
 Depends: libasm3-java, ${misc:Depends}
+Built-Using: libasm3-java (= 3.3.2-2)
 Conflicts: libcglib2.1-java
 Provides: libcglib2.1-java
 Replaces: libcglib2.1-java

Modified: trunk/cglib/debian/copyright
===================================================================
--- trunk/cglib/debian/copyright	2014-02-11 11:10:20 UTC (rev 17762)
+++ trunk/cglib/debian/copyright	2014-02-11 12:19:19 UTC (rev 17763)
@@ -2,6 +2,10 @@
 Upstream-Name: CGLib, Code Generation Library
 Upstream-Contact: http://cglib.sourceforge.net/
 Source: http://sourceforge.net/projects/cglib/
+Comment:
+ This project generates a cglib-nodep.jar incorporating the classes from asm
+ under a different package to avoid classpath conflicts. These classes are
+ licensed under a BSD license (see bolow).
 
 Files: *
 Copyright: 2002-2004 The Apache Software Foundation

Modified: trunk/cglib/debian/orig-tar.sh
===================================================================
--- trunk/cglib/debian/orig-tar.sh	2014-02-11 11:10:20 UTC (rev 17762)
+++ trunk/cglib/debian/orig-tar.sh	2014-02-11 12:19:19 UTC (rev 17763)
@@ -4,13 +4,13 @@
 
 VERSION=$(dpkg-parsechangelog | sed -ne 's,^Version: \(.*\)-.*,\1,p')
 SOURCE=$(dpkg-parsechangelog | sed -ne 's,Source: \(.*\),\1,p')
-TAR=../${SOURCE}_${VERSION}.orig.tar.gz
+TAR=../${SOURCE}_${VERSION}.orig.tar.xz
 DIR=cglib-$VERSION
 
 # clean up the upstream tarball
 mkdir $DIR
 (cd $DIR && jar xf ../$3)
-tar -c -z -f $TAR --exclude '*/lib/*' $DIR
+tar -c -J -f $TAR --exclude '*.jar' $DIR
 rm -rf $3 $DIR
 
 # move to directory 'tarballs'