[Python-apps-commits] r12395 - in packages/hovercraft/trunk/debian (5 files)

[danstender-guest at users.alioth.debian.org]

    Date: Wednesday, September 23, 2015 @ 17:21:54
  Author: danstender-guest
Revision: 12395

create +dfsg tarball by uscan (Files-Excluded in copyright) instead of repack.sh (dropped)

Modified:
  packages/hovercraft/trunk/debian/changelog
  packages/hovercraft/trunk/debian/copyright
  packages/hovercraft/trunk/debian/rules
  packages/hovercraft/trunk/debian/watch
Deleted:
  packages/hovercraft/trunk/debian/repack.sh

Modified: packages/hovercraft/trunk/debian/changelog
===================================================================
--- packages/hovercraft/trunk/debian/changelog	2015-09-23 13:37:23 UTC (rev 12394)
+++ packages/hovercraft/trunk/debian/changelog	2015-09-23 17:21:54 UTC (rev 12395)
@@ -2,4 +2,4 @@
 
   * Initial release (Closes: #775016).
 
- -- Daniel Stender <debian at danielstender.com>  Thu, 19 Mar 2015 13:21:21 +0100
+ -- Daniel Stender <debian at danielstender.com>  Wed, 23 Sep 2015 19:19:17 +0200

Modified: packages/hovercraft/trunk/debian/copyright
===================================================================
--- packages/hovercraft/trunk/debian/copyright	2015-09-23 13:37:23 UTC (rev 12394)
+++ packages/hovercraft/trunk/debian/copyright	2015-09-23 17:21:54 UTC (rev 12395)
@@ -2,6 +2,9 @@
 Upstream-Name: hovercraft
 Upstream-Contact: Lennart Regebro <regebro at gmail.com>
 Source: https://github.com/regebro/hovercraft
+Files-Excluded: docs/examples/images/python-logo-master-v3-TM.png
+                hovercraft/tests/test_data/images/python-logo-master-v3-TM.png
+                hovercraft/tests/test_data/maximal/images/python-logo-master-v3-TM.png
 
 Files: *
 Copyright: 2013-2014 Lennart Regebro

Deleted: packages/hovercraft/trunk/debian/repack.sh
===================================================================
--- packages/hovercraft/trunk/debian/repack.sh	2015-09-23 13:37:23 UTC (rev 12394)
+++ packages/hovercraft/trunk/debian/repack.sh	2015-09-23 17:21:54 UTC (rev 12395)
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-# Repackaging script to be called by Uscan, but that
-# makes problems with .zip archives. Therefore, called
-# here by debian/rules (get-orig-source).
-
-echo "Repackaging ..."
-TARBALL="$3"
-TMP=`mktemp -d`
-PKG="`dpkg-parsechangelog|sed 's/^Source: //p;d'`_$2+dfsg.orig"
-
-echo "Extracting tarball into $TMP ..."
-tar xzf "$TARBALL" -C "$TMP"
-cd "$TMP"
-
-echo "Removing unwanted stuff ..."
-find hovercraft-* -name python-logo-master-v3-TM.png -exec rm -fv '{}' \;
-
-echo "Packaging ..."
-tar -czf "$PKG.tar.gz" hovercraft-*/
-
-echo "Repackaged tarball created in $TMP."

Modified: packages/hovercraft/trunk/debian/rules
===================================================================
--- packages/hovercraft/trunk/debian/rules	2015-09-23 13:37:23 UTC (rev 12394)
+++ packages/hovercraft/trunk/debian/rules	2015-09-23 17:21:54 UTC (rev 12395)
@@ -22,4 +22,3 @@
 
 get-orig-source:
 	uscan --no-conf --verbose --download-current-version --destdir ../ --rename
-	sh debian/repack.sh notneeded 2.0~b1 ../hovercraft_2.0~b1.orig.tar.gz

Modified: packages/hovercraft/trunk/debian/watch
===================================================================
--- packages/hovercraft/trunk/debian/watch	2015-09-23 13:37:23 UTC (rev 12394)
+++ packages/hovercraft/trunk/debian/watch	2015-09-23 17:21:54 UTC (rev 12395)
@@ -1,5 +1,6 @@
 version=3
 opts=uversionmangle=s/(rc|a|b|c)/~$1/,\
-dversionmangle=s/\+dfsg\d*$// \
+dversionmangle=s/\+dfsg\d*$//,\
+repacksuffix=+dfsg \
 http://pypi.debian.net/hovercraft/ \
 hovercraft-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))