[SCM] Packaging for libjna-java a library for dynamic access of native libraries from Java without JNI branch, master, updated. debian/3.2.7-4-14-g2512b8c

[Andrew Ross]

The following commit has been merged in the master branch:
commit ce59ec18866736515e9dfeed29ca9d3e37c80307
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Sun Jul 22 22:47:23 2012 +0100

    refresh packaging

diff --git a/debian/changelog b/debian/changelog
index 6ba9a70..7f48853 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,13 @@
-libjna-java (3.3.0-1) unstable; urgency=low
+libjna-java (3.4.1-1) unstable; urgency=low
 
   * New upstream release.
   * Refresh patches.
   * Bump standards version (no changes required).
   * Link javadoc to default-jdk API
-  * Remove Michael Koch <konqueror at gmx.de> from uploaders 
+  * Remove Michael Koch <konqueror at gmx.de> from uploaders
     (Closes: #654084).
 
- -- Andrew Ross <ubuntu at rossfamily.co.uk>  Mon, 16 Jul 2012 18:17:37 +0100
+ -- Andrew Ross <ubuntu at rossfamily.co.uk>  Sun, 22 Jul 2012 21:40:29 +0100
 
 libjna-java (3.2.7-4) unstable; urgency=low
 
diff --git a/debian/libjna-java.poms b/debian/libjna-java.poms
index d4f7111..31b891a 100644
--- a/debian/libjna-java.poms
+++ b/debian/libjna-java.poms
@@ -1 +1 @@
-pom.xml
+pom-jna.xml
diff --git a/debian/repack-source.sh b/debian/repack-source.sh
deleted file mode 100755
index 3fec117..0000000
--- a/debian/repack-source.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-if [ $# -ne 3 ]
-then
-    echo "Usage: $0 option version filename"
-    echo "If option=--upstream-version, run uupdate after repacking sources."
-    echo "Filename is never used, as uscan will always download the wrong file."
-    exit
-fi
-
-VERSION=$2
-
-CURDIR=$(pwd)
-TMPDIR=`mktemp -d libjna-tmp.XXXXXX`
-BASEDIR=$TMPDIR/libjna-java-${VERSION}
-mkdir ${BASEDIR}
-TARGET=$(dirname "$3")/libjna-java_${VERSION}.orig.tar.gz
-
-# retrieve sources from svn
-# svn export https://svn.java.net/svn/jna~svn/tags/${VERSION}/jnalib/ --username guest ${BASEDIR}
-wget --no-check-certificate \
-      --directory-prefix=${TMPDIR} \
-      https://svn.java.net/svn/jna~svn/tags/${VERSION}/jnalib/pom.xml \
-      https://svn.java.net/svn/jna~svn/tags/${VERSION}/jnalib/dist/src.zip \
-      https://svn.java.net/svn/jna~svn/tags/${VERSION}/jnalib/src/com/sun/jna/overview.html \
-      https://svn.java.net/svn/jna~svn/tags/${VERSION}/jnalib/src/com/sun/jna/package.html
-
-unzip -d ${BASEDIR} ${TMPDIR}/src.zip
-
-# remove jar files
-rm -rf ${BASEDIR}/lib
-
-# remove libffi
-rm -rf ${BASEDIR}/native/libffi
-
-# files missing in src.zip
-mv ${TMPDIR}/*html ${BASEDIR}/src/com/sun/jna/
-mv ${TMPDIR}/*xml ${BASEDIR}/
-
-# Repack
-GZIP=-9 tar -C "$TMPDIR" -czf "${TARGET}" "libjna-java-${VERSION}"
-
-# Clean temporary files
-rm -rf "$TMPDIR"
-rm -rf "$BASEDIR"
-rm -f "$FILENAME"
-
-if [ $1 = --upstream-version ] ;
-then
-    uupdate --upstream-version $2 "${TARGET}"
-fi
diff --git a/debian/rules b/debian/rules
index 91e4e4b..154fd41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,11 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 
 override_dh_auto_clean:
-	if [ -f nbproject/profiler-build-impl.xml ]; then \
-		ant -f build.xml clean; \
-	fi
+	ant -f build.xml clean
 	rm -f build.number
 	rm -rf build doc
 	rm -rf contrib/platform/build
+	rm -f dist/platforms-sources.jar
 	mh_clean
 	dh_clean
 
@@ -20,7 +19,7 @@ override_dh_auto_build:
 
 # install. using platform.jar is a silly idea in /usr/share/java/ as it's bound to collide
 override_dh_auto_install:
-	mh_installjar -plibjna-java -l --usj-name=jna pom.xml build/jna.jar
+	mh_installjar -plibjna-java -l --usj-name=jna pom-jna.xml build/jna.jar
 	jh_installlibs -plibjna-java build/jna-platform.jar
 
 override_dh_makeshlibs:

-- 
Packaging for libjna-java a library for dynamic access of native libraries from Java without JNI