[pkg-java] r11201 - trunk/libslf4j-java/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2009-12-03 22:36:15 +0000 (Thu, 03 Dec 2009)
New Revision: 11201

Added:
   trunk/libslf4j-java/debian/orig-tar.exclude
Modified:
   trunk/libslf4j-java/debian/build.xml
   trunk/libslf4j-java/debian/changelog
   trunk/libslf4j-java/debian/compat
   trunk/libslf4j-java/debian/control
   trunk/libslf4j-java/debian/orig-tar.sh
   trunk/libslf4j-java/debian/rules
Log:
* New upstream release
  - disable build of ext module as org/slf4j/cal10n is
    not yet in Debian.
* Update my email address
* Bump debhelper version to >= 7

Modified: trunk/libslf4j-java/debian/build.xml
===================================================================
--- trunk/libslf4j-java/debian/build.xml	2009-12-03 22:35:58 UTC (rev 11200)
+++ trunk/libslf4j-java/debian/build.xml	2009-12-03 22:36:15 UTC (rev 11201)
@@ -13,7 +13,7 @@
     <delete dir="${slf4j-nop.dir}/${class.dir}" quiet="true"/>
     <delete dir="${slf4j-simple.dir}/${class.dir}" quiet="true"/>
     <delete dir="${slf4j-migrator.dir}/${class.dir}" quiet="true"/>
-    <delete dir="${slf4j-ext.dir}/${class.dir}" quiet="true"/>
+<!--    <delete dir="${slf4j-ext.dir}/${class.dir}" quiet="true"/> -->
 
     <delete file="${jcl-over-slf4j.jar}" quiet="true"/>
     <delete file="${jul-to-slf4j.jar}" quiet="true"/>
@@ -25,7 +25,7 @@
     <delete file="${slf4j-nop.jar}" quiet="true"/>
     <delete file="${slf4j-simple.jar}" quiet="true"/>
     <delete file="${slf4j-migrator.jar}" quiet="true"/>
-    <delete file="${slf4j-ext.jar}" quiet="true"/>
+<!--    <delete file="${slf4j-ext.jar}" quiet="true"/> -->
   </target>
 
   <target name="jar">
@@ -129,7 +129,7 @@
       </fileset>
     </jar>
 
-    <mkdir dir="${slf4j-ext.dir}/${class.dir}"/>
+<!--    <mkdir dir="${slf4j-ext.dir}/${class.dir}"/>
     <javac srcdir="${slf4j-ext.dir}/${source.dir}" destdir="${slf4j-ext.dir}/${class.dir}"
       debug="true" source="1.5" target="1.5" classpath="${slf4j-api.jar}:/usr/share/java/javassist.jar:/usr/share/java/commons-lang.jar"/>
 
@@ -138,7 +138,7 @@
           <include name="**"/>
       </fileset>
     </jar>
-
+-->
   </target>
 
 </project>

Modified: trunk/libslf4j-java/debian/changelog
===================================================================
--- trunk/libslf4j-java/debian/changelog	2009-12-03 22:35:58 UTC (rev 11200)
+++ trunk/libslf4j-java/debian/changelog	2009-12-03 22:36:15 UTC (rev 11201)
@@ -1,3 +1,13 @@
+libslf4j-java (1.5.10-1) unstable; urgency=low
+
+  * New upstream release
+    - disable build of ext module as org/slf4j/cal10n is
+      not yet in Debian.
+  * Update my email address
+  * Bump debhelper version to >= 7
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 03 Dec 2009 23:35:00 +0100
+
 libslf4j-java (1.5.8-3) unstable; urgency=low
 
   * Update Standards-Version to 3.8.3

Modified: trunk/libslf4j-java/debian/compat
===================================================================
--- trunk/libslf4j-java/debian/compat	2009-12-03 22:35:58 UTC (rev 11200)
+++ trunk/libslf4j-java/debian/compat	2009-12-03 22:36:15 UTC (rev 11201)
@@ -1 +1 @@
-6
+7

Modified: trunk/libslf4j-java/debian/control
===================================================================
--- trunk/libslf4j-java/debian/control	2009-12-03 22:35:58 UTC (rev 11200)
+++ trunk/libslf4j-java/debian/control	2009-12-03 22:36:15 UTC (rev 11201)
@@ -2,8 +2,8 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>, Damien Raude-Morvan <drazzib at drazzib.com>
-Build-Depends: cdbs, debhelper (>= 6), ant, default-jdk
+Uploaders: Varun Hiremath <varun at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
 Build-Depends-Indep: maven-repo-helper, liblog4j1.2-java,
  libcommons-logging-java, libcommons-lang-java, libjavassist-java
 Standards-Version: 3.8.3

Added: trunk/libslf4j-java/debian/orig-tar.exclude
===================================================================
--- trunk/libslf4j-java/debian/orig-tar.exclude	                        (rev 0)
+++ trunk/libslf4j-java/debian/orig-tar.exclude	2009-12-03 22:36:15 UTC (rev 11201)
@@ -0,0 +1,3 @@
+*.jar
+*/site*
+*/slf4j-site*

Modified: trunk/libslf4j-java/debian/orig-tar.sh
===================================================================
--- trunk/libslf4j-java/debian/orig-tar.sh	2009-12-03 22:35:58 UTC (rev 11200)
+++ trunk/libslf4j-java/debian/orig-tar.sh	2009-12-03 22:36:15 UTC (rev 11201)
@@ -1,12 +1,14 @@
 #!/bin/sh -e
 
 # $2 = version
+# $3 = file
 DIR=libslf4j-java-$2.orig
+TAR=$3
 
 # clean up the upstream tarball
-tar -z -x -f $3
+tar xzf $TAR
 mv slf4j-$2 $DIR
-GZIP=--best tar -c -z -f $3 --exclude '*.jar' --exclude '*/site*' --exclude '*/slf4j-site*' $DIR
+GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
 rm -rf $DIR
 
 # move to directory 'tarballs'

Modified: trunk/libslf4j-java/debian/rules
===================================================================
--- trunk/libslf4j-java/debian/rules	2009-12-03 22:35:58 UTC (rev 11200)
+++ trunk/libslf4j-java/debian/rules	2009-12-03 22:36:15 UTC (rev 11201)
@@ -22,5 +22,5 @@
 	-rm -rf debian/tmp
 
 get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename