[Python-apps-commits] r11630 - in packages/frescobaldi/trunk/debian (4 files)

[foka at users.alioth.debian.org]

    Date: Sunday, December 21, 2014 @ 11:54:15
  Author: foka
Revision: 11630

Replace cleanup.sh with get-orig-source (uscan --repack) call

With the new "uscan --repack" supporting Files-Excluded field
in debian/copyright, add the get-orig-source target in
debian/rules to fetch and repack upstream tarball rather than
using a custom cleanup.sh script.

Also revise debian/watch to link to GitHub directly
and to use the new repacksuffix option.

Modified:
  packages/frescobaldi/trunk/debian/README.source
  packages/frescobaldi/trunk/debian/cleanup.sh
  packages/frescobaldi/trunk/debian/rules
  packages/frescobaldi/trunk/debian/watch

Modified: packages/frescobaldi/trunk/debian/README.source
===================================================================
--- packages/frescobaldi/trunk/debian/README.source	2014-12-21 11:39:08 UTC (rev 11629)
+++ packages/frescobaldi/trunk/debian/README.source	2014-12-21 11:54:15 UTC (rev 11630)
@@ -1,5 +1,5 @@
-frescobaldi
------------
+frescobaldi for Debian
+----------------------
 
   The following files were deleted in the upstream tarball to avoid both taking
   up unneeded space due to file duplication and a copyright headache:
@@ -11,3 +11,18 @@
   This is reproducible through the debian/cleanup.sh shell script.
 
  -- Ryan Kavanagh <rak at debian.org>  Tue, 13 Mar 2012 09:35:01 -0400
+
+
+  Fast forward to 2014, uscan now supports the repacking the upstream
+  tarball excluding files listed in the File-Excluded field in the
+  debian/copyright file.  For example:
+
+      XZ_OPT=-e uscan --repack --compression xz
+
+  It is recommended to run "debian/rules get-orig-source" to
+  automatically download the latest Frescobaldi upstream tarball
+  and repack it.
+
+  The debian/cleanup.sh shell script is henceforth obsolete.
+ 
+ -- Anthony Fok <foka at debian.org>  Sun, 21 Dec 2014 04:46:11 -0700

Modified: packages/frescobaldi/trunk/debian/cleanup.sh
===================================================================
--- packages/frescobaldi/trunk/debian/cleanup.sh	2014-12-21 11:39:08 UTC (rev 11629)
+++ packages/frescobaldi/trunk/debian/cleanup.sh	2014-12-21 11:54:15 UTC (rev 11630)
@@ -1,5 +1,13 @@
 #!/bin/sh
 
+cat <<EOF
+The script $0 is obsolete as of December 2014.
+Please use "debian/rules get-orig-source" instead.
+See debian/README.source for more information.
+
+EOF
+exit 0
+
 rm -fr frescobaldi_app/icons/Tango
 find frescobaldi_app/hyphdicts -name '*.txt*' -exec rm -f {} \;
 find frescobaldi_app/hyphdicts -name '*.dic' -exec rm -f {} \;

Modified: packages/frescobaldi/trunk/debian/rules
===================================================================
--- packages/frescobaldi/trunk/debian/rules	2014-12-21 11:39:08 UTC (rev 11629)
+++ packages/frescobaldi/trunk/debian/rules	2014-12-21 11:54:15 UTC (rev 11630)
@@ -2,3 +2,10 @@
 
 %:
 	dh $@ --with python2
+
+.PHONY: get-orig-source
+get-orig-source:
+	XZ_OPT=-e uscan --noconf --verbose --destdir=$(CURDIR) \
+	                --repack --compression xz
+
+.DEFAULT_GOAL :=

Modified: packages/frescobaldi/trunk/debian/watch
===================================================================
--- packages/frescobaldi/trunk/debian/watch	2014-12-21 11:39:08 UTC (rev 11629)
+++ packages/frescobaldi/trunk/debian/watch	2014-12-21 11:54:15 UTC (rev 11630)
@@ -1,3 +1,3 @@
 version=3
-opts="filenamemangle=s at .*/v at frescobaldi-@,dversionmangle=s@\+ds\d+$@@g" \
-http://githubredir.debian.net/github/wbsoft/frescobaldi .*/v(.*).tar.gz
+opts="repacksuffix=+ds1,filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/frescobaldi-$1\.tar\.gz/,dversionmangle=s/\+ds\d*$//" \
+  https://github.com/wbsoft/frescobaldi/tags .*/v?(\d\S*)\.tar\.gz