[pkg-java] r14597 - in trunk/libxml-security-java/debian: . source

[Torsten Werner]

Author: twerner
Date: 2011-08-30 11:47:19 +0000 (Tue, 30 Aug 2011)
New Revision: 14597

Added:
   trunk/libxml-security-java/debian/source/
   trunk/libxml-security-java/debian/source/format
Modified:
   trunk/libxml-security-java/debian/changelog
   trunk/libxml-security-java/debian/control
   trunk/libxml-security-java/debian/orig-tar.sh
   trunk/libxml-security-java/debian/rules
   trunk/libxml-security-java/debian/watch
Log:
UNRELEASED
* New upstream release
* Update debian/watch to point to new SVN repo.
* Update Standards-Version: 3.9.1.
* Switch to source format 3.0.

Modified: trunk/libxml-security-java/debian/changelog
===================================================================
--- trunk/libxml-security-java/debian/changelog	2011-08-30 11:28:30 UTC (rev 14596)
+++ trunk/libxml-security-java/debian/changelog	2011-08-30 11:47:19 UTC (rev 14597)
@@ -1,3 +1,13 @@
+libxml-security-java (1.4.5-1) unstable; urgency=low
+
+  UNRELEASED
+  * New upstream release
+  * Update debian/watch to point to new SVN repo.
+  * Update Standards-Version: 3.9.1.
+  * Switch to source format 3.0.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 30 Aug 2011 13:44:22 +0200
+
 libxml-security-java (1.4.3-2) unstable; urgency=low
 
   [ Thierry Carrez ]

Modified: trunk/libxml-security-java/debian/control
===================================================================
--- trunk/libxml-security-java/debian/control	2011-08-30 11:28:30 UTC (rev 14596)
+++ trunk/libxml-security-java/debian/control	2011-08-30 11:47:19 UTC (rev 14597)
@@ -6,7 +6,7 @@
  Niels Thykier <niels at thykier.net>
 Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
 Build-Depends-Indep: libcommons-logging-java, libxalan2-java
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Homepage: http://xml.apache.org/security/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxml-scurity-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxml-security-java

Modified: trunk/libxml-security-java/debian/orig-tar.sh
===================================================================
--- trunk/libxml-security-java/debian/orig-tar.sh	2011-08-30 11:28:30 UTC (rev 14596)
+++ trunk/libxml-security-java/debian/orig-tar.sh	2011-08-30 11:47:19 UTC (rev 14597)
@@ -1,18 +1,16 @@
 #!/bin/sh -e
 
-# called by uscan with '--upstream-version' <version> <file>
-TAR=../libxml-security-java_$2.orig.tar.gz
-DIR=libxml-security-java-$2.orig
+VERSION=$2
+TAR=../libxml-security-java_$VERSION.orig.tar.gz
+DIR=libxml-security-java-$VERSION
+TAG="$VERSION"
 
-# clean up the upstream tarball
-unzip $3
-mv xml-security* $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' $DIR
-rm -rf $3 $DIR
+svn export http://svn.apache.org/repos/asf/santuario/xml-security-java/tags/${TAG}/ $DIR
+tar -c -z -f $TAR --exclude '*.jar' $DIR
+rm -rf $DIR ../$TAG
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
   . .svn/deb-layout
-  mv $TAR $origDir
-  echo "moved $TAR to $origDir"
+  mv $TAR $origDir && echo "moved $TAR to $origDir"
 fi

Modified: trunk/libxml-security-java/debian/rules
===================================================================
--- trunk/libxml-security-java/debian/rules	2011-08-30 11:28:30 UTC (rev 14596)
+++ trunk/libxml-security-java/debian/rules	2011-08-30 11:47:19 UTC (rev 14597)
@@ -13,4 +13,4 @@
 	dh_link /usr/share/java/xml-security-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xml-security.jar
 
 get-orig-source:
-	-uscan --upstream-version 0	
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download

Added: trunk/libxml-security-java/debian/source/format
===================================================================
--- trunk/libxml-security-java/debian/source/format	                        (rev 0)
+++ trunk/libxml-security-java/debian/source/format	2011-08-30 11:47:19 UTC (rev 14597)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: trunk/libxml-security-java/debian/watch
===================================================================
--- trunk/libxml-security-java/debian/watch	2011-08-30 11:28:30 UTC (rev 14596)
+++ trunk/libxml-security-java/debian/watch	2011-08-30 11:47:19 UTC (rev 14597)
@@ -1,3 +1,4 @@
 version=3
-opts="uversionmangle=s/_/./g,dversionmangle=s/_/./g" \
-http://xml.apache.org/security/dist/java-library/ xml-security-src-(.*)\.zip debian debian/orig-tar.sh
+
+http://svn.apache.org/repos/asf/santuario/xml-security-java/tags/ (\d[\d.]*)/ \
+    debian debian/orig-tar.sh