[pleiades] 14/21: Imported Debian patch 1.4.0-dfsg-2

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch master
in repository pleiades.

commit ff5251d05eda8775b51b7e4c322ffabb86e3558f
Author: Hideki Yamane <henrich at debian.org>
Date:   Sun Apr 7 07:44:23 2013 +0900

    Imported Debian patch 1.4.0-dfsg-2
---
 debian/changelog |  8 ++++++++
 debian/repack.sh | 55 -------------------------------------------------------
 debian/rules     | 13 +++++++++++++
 debian/watch     |  3 +--
 4 files changed, 22 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9bd3b4d..5822bc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pleiades (1.4.0-dfsg-2) unstable; urgency=low
+
+  * upload to unstable
+  * debian/rules,watch
+    - add get-orig-source target
+
+ -- Hideki Yamane <henrich at debian.org>  Sun, 07 Apr 2013 07:44:23 +0900
+
 pleiades (1.4.0-dfsg-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/repack.sh b/debian/repack.sh
deleted file mode 100755
index 5706b5e..0000000
--- a/debian/repack.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh
-# - remove unclear license files from upstream zipfile
-# - repack upstream zip to xz
-
-set -ue
-
-UPSTREAM="pleaiades"
-REMOVE="srctest/jp/sourceforge/mergedoc/pleiades/resource/3.*"
-
-
-if [ ! -z $REMOVE ]; then
-	for files in $REMOVE;
-	do rm -rf $UPSTREAM-[0-9]*/$REMOVE
-	done
-	rename 's/*/*-dfsg/' $UPSTREAM-[0-9]*
-fi
-
-if [ $ZIP = YES ]; then
-  tar cf $UPSTREAM-[0-9]*.tar $UPSTREAM-[0-9]*
-fi
-
-case )
-	*.gz
-	*.bz2
-	*.zip
-	*.7z
-
-xz -9 $UPSTREAM-[0-9]*
-
-exit 0
-
-="$2"
-FILE="$3"
-PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
-REPACK_DIR="$PKG-$VER.orig"
-echo -e "\nRepackaging $FILE\n"
-DIR=`mktemp -d ./tmpRepackXXXXXX`
-trap "rm -rf \"$DIR\"" QUIT INT EXIT
-# Create an extra directory to cope with rootless tarballs
-UP_BASE="$DIR/unpack"
-mkdir "$UP_BASE"
-tar xJf "$FILE" -C "$UP_BASE"
-
-if [ `ls -1 "$UP_BASE" | wc -l` -eq 1 ]; then
-        # Tarball does contain a root directory
-        UP_BASE="$UP_BASE/`ls -1 "$UP_BASE"`"
-fi
-mv "$UP_BASE" "$DIR/$REPACK_DIR"
-# Using a pipe hides tar errors!
-tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
-xz --best  < "$DIR/repacked.tar" > "$DIR/repacked.tar.xz"
-FILE="../${PKG}_${VER}.orig.tar.xz"
-mv "$DIR/repacked.tar.xz" "$FILE"
-echo "*** $FILE repackaged"
-
diff --git a/debian/rules b/debian/rules
index ec9fb33..05fae1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,10 @@
 packagename=pleiades
 eclipse_dir=usr/share/eclipse
 
+UPSTREAM_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ':' | sed 's/ //' | sed 's/-dfsg.*$$//')
+COMPAT_VERSION = $(UPSTREAM_VERSION)~dfsg
+REMOVE_FILES="srctest/jp/sourceforge/mergedoc/pleiades/resource/3.*"
+
 %:
 	dh  $@ --parallel
 
@@ -27,3 +31,12 @@ override_dh_installchangelogs:
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz -Sextreme -z9
+
+get-orig-source:
+	TMPDIR=`mktemp -d`;\
+	uscan --download-version $(UPSTREAM_VERSION) --destdir $$TMPDIR --force-download --no-symlink ;\
+	mkdir -p $$TMPDIR/pleiades ;\
+	unzip $$TMPDIR/pleiades_$(UPSTREAM_VERSION)-src.zip -d $$TMPDIR/pleiades ;\
+	for i in $(REMOVE_FILES) ; do rm -rf $$TMPDIR/pleiades/$$i; done ;\
+	cd $$TMPDIR; tar cJf pleiades_$(COMPAT_VERSION).orig.tar.xz pleiades ;\
+	rm -rf $$TMPDIR/pleiades-$(UPSTREAM_VERSION) 
diff --git a/debian/watch b/debian/watch
index 5d40ff3..aadd772 100644
--- a/debian/watch
+++ b/debian/watch
@@ -4,5 +4,4 @@ opts="downloadurlmangle=s/sourceforge/iij.dl.sourceforge/;s/downloads\///;s/proj
 uversionmangle=s/-beta/~beta/;s/-rc/~rc/;s/-preview/~preview/,\
 dversionmangle=s/-dfsg//;s/~I/~/" \
  http://sourceforge.jp/projects/mergedoc/releases/ \
-  /projects/mergedoc/downloads/.*/pleiades_(.*)\-src.zip/ debian uupdate
-
+  /projects/mergedoc/downloads/.*/pleiades_(.*)\-src.zip/ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/pleiades.git