[pkg-java] r12491 - trunk/libjgrapht-java/branch_0.8/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-22 09:40:25 +0000 (Sat, 22 May 2010)
New Revision: 12491

Modified:
   trunk/libjgrapht-java/branch_0.8/debian/orig-tar.sh
   trunk/libjgrapht-java/branch_0.8/debian/rules
Log:
add get-orig-source target and simplify the repackaging


Modified: trunk/libjgrapht-java/branch_0.8/debian/orig-tar.sh
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/orig-tar.sh	2010-05-21 22:52:16 UTC (rev 12490)
+++ trunk/libjgrapht-java/branch_0.8/debian/orig-tar.sh	2010-05-22 09:40:25 UTC (rev 12491)
@@ -2,33 +2,28 @@
 
 set -e
 
-VERSION=$2
 DOWNLOADED_FILE=$3
-DOWNLOADED_FILENAME=$(basename "$DOWNLOADED_FILE")
-PACKAGE=$(dpkg-parsechangelog | sed -n 's/^Source: //p')
-TEMPDIR=$(mktemp -d)
-WORKDIR=$PWD
 
-cp "$DOWNLOADED_FILE" "$TEMPDIR"
-cd "$TEMPDIR"
 echo "Extracting downloaded archive"
-tar zxfv "$DOWNLOADED_FILENAME"
-ROOTDIR=$(tar zft "$DOWNLOADED_FILENAME" | head -n 1 | cut -d'/' -f1)
+tar zxfv "$DOWNLOADED_FILE"
+ROOTDIR=$(tar zft "$DOWNLOADED_FILE" | head -n 1 | cut -d'/' -f1)
 cd "$ROOTDIR"
 echo "Deleting all JAR files"
-find -iname \*.jar -print0 | xargs -0 rm -v
+find -iname \*.jar -delete
 echo "Deleting the precompiled Javadoc documentation"
 rm -fvr javadoc
 echo "Deleting the touchgraph compatibility code"
 rm -fvr src/org/jgrapht/experimental/touchgraph
 echo "Repacking archive"
 cd ..
-tar czfv "$DOWNLOADED_FILENAME" "$ROOTDIR"
-cd "$WORKDIR"
-cp "$TEMPDIR"/"$DOWNLOADED_FILENAME" "$DOWNLOADED_FILE"
+tar czfv "$DOWNLOADED_FILE" "$ROOTDIR"
 echo "Deleting temporary directory"
-rm -fr "$TEMPDIR"
-echo "Moving the tarballs in the tarballs/ directory"
-mv "$DOWNLOADED_FILE" "$(readlink -f "$DOWNLOADED_FILE")" ../tarballs/
+rm -fr "$ROOTDIR"
+
+if [ -d ../tarballs ]; then
+  echo "Moving the tarballs in the tarballs/ directory"
+  mv "$DOWNLOADED_FILE" ../tarballs/
+fi
+
 echo "Finished! :-)"
 

Modified: trunk/libjgrapht-java/branch_0.8/debian/rules
===================================================================
--- trunk/libjgrapht-java/branch_0.8/debian/rules	2010-05-21 22:52:16 UTC (rev 12490)
+++ trunk/libjgrapht-java/branch_0.8/debian/rules	2010-05-22 09:40:25 UTC (rev 12491)
@@ -18,3 +18,5 @@
 install/libjgrapht$(SOVERSION)-java::
 	dh_link -plibjgrapht$(SOVERSION)-java /usr/share/java/jgrapht-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jgrapht$(SOVERSION).jar
 
+get-orig-source:
+	uscan --force-download --rename