5 files changed, 61 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index 52a525b..cc82ca6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
-scons-doc (2.3.5-1) UNRELEASED; urgency=medium
+scons-doc (2.3.5+repack-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches.
+  * Move download and repack from debian/rules to uscan:
+    - Add debian debian/repack.sh to debian/watch.
+    - New debian/repack.sh.
+    - Remove get-orig-source from debian/rules.
+  * Rename source to +repack.
+  * Add README.rst to debian/docs.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 15 Jun 2015 19:22:32 +0200
 
diff --git a/debian/docs b/debian/docs
index 748755d..f2d1188 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,3 @@
 build/doc/HTML
 build/doc/PDF
+README.rst
+\ No newline at end of file
diff --git a/debian/repack.sh b/debian/repack.sh
new file mode 100755
index 0000000..233dea5
--- /dev/null
+++ b/debian/repack.sh
@@ -0,0 +1,50 @@
+#!/bin/sh -e
+# Repackaging script to be called by Uscan
+
+echo "Repackaging ..."
+TMP="../"
+PKG="`dpkg-parsechangelog|sed 's/^Source: //p;d'`_$2+repack.orig"
+
+
+echo "Extracting tarball ..."
+tar xzf "$3" -C "$TMP"
+cd "$TMP"
+
+echo "Rename source dir"
+#ls -l
+mv scons-src-$2 scons-doc-$2
+
+echo "Removing unwanted stuff ..."
+cd scons-doc-$2
+#mv scons-src-$2 scons-doc-$2
+#cd scons-doc-$2
+ls -l
+rm -rf HOWTO
+rm -rf debian
+rm -rf bench
+rm -rf examples
+rm -rf gentoo
+rm -rf rpm
+rm -rf template
+rm -rf test
+rm -rf testing
+rm -rf timings
+rm -rf .hgtags
+rm -rf *-local
+rm -rf ReleaseConfig
+rm -rf runtest.py
+ls -l
+#cd ..
+
+echo "Creating repack tarball ..."
+tar -caf "../scons-doc_$2+repack.orig.tar.xz" *
+
+cd ..
+echo "Clean tmp dir ..."
+rm -rf scons-doc-$2
+
+echo "Clean uscan files ..."
+rm -rf scons-src-2.3.5.tar.gz
+rm -rf scons-doc_2.3.5.orig.tar.gz
+
+echo "Repackaged tarball created"
diff --git a/debian/rules b/debian/rules
index ece7b75..14a1833 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/')
-
 %:
 	dh $@
 
@@ -13,16 +11,3 @@ override_dh_auto_clean:
 override_dh_auto_install:
 	scons doc
 	rm -fr $(CURDIR)/build/doc/HTML/scons-user
-
-get-orig-source:
-	wget http://downloads.sourceforge.net/project/scons/scons-src/${VERSION}/scons-src-${VERSION}.tar.gz -O ../scons-src-${VERSION}.tar.gz
-	tar fxz ../scons-src-${VERSION}.tar.gz -C ../ && mv ../scons-src-${VERSION} ../scons-doc-${VERSION}
-
-	# remove DFSG-incompatible files
-#	rm -fr ../scons-doc-${VERSION}/doc/user/titlepage/SConsBuildBricks_path.svg ../scons-doc-${VERSION}/doc/design/titlepage/SConsBuildBricks_path.svg \
-#	    ../scons-doc-${VERSION}/doc/man/titlepage/SConsBuildBricks_path.svg ../scons-doc-${VERSION}/doc/reference/titlepage/SConsBuildBricks_path.svg
-
-	tar -caf ../scons-doc_${VERSION}.orig.tar.xz ../scons-doc-${VERSION}/bin ../scons-doc-${VERSION}/bootstrap.py \
-		../scons-doc-${VERSION}/config ../scons-doc-${VERSION}/doc ../scons-doc-${VERSION}/LICENSE \
-		../scons-doc-${VERSION}/QMTest ../scons-doc-${VERSION}/SConstruct ../scons-doc-${VERSION}/src
-	rm -fr ../scons-doc-${VERSION} ../scons-src-${VERSION}.tar.gz
diff --git a/debian/watch b/debian/watch
index 8d6f837..b9b669c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\+dfsg(.*)// \
-http://sf.net/scons/scons-src-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+opts=dversionmangle=s/\+repack(.*)// \
+http://sf.net/scons/scons-src-(\d\S*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) debian debian/repack.sh