[Python-apps-commits] r8445 - in packages/wapiti/trunk/debian (4 files)

[adejong at users.alioth.debian.org]

    Date: Sunday, April 8, 2012 @ 16:39:09
  Author: adejong
Revision: 8445

  * Provide a get-orig-source target that drops the unused and non-free
    json.js from the upstream tarball.

Added:
  packages/wapiti/trunk/debian/README.source
Modified:
  packages/wapiti/trunk/debian/changelog
  packages/wapiti/trunk/debian/rules
  packages/wapiti/trunk/debian/watch

Added: packages/wapiti/trunk/debian/README.source
===================================================================
--- packages/wapiti/trunk/debian/README.source	                        (rev 0)
+++ packages/wapiti/trunk/debian/README.source	2012-04-08 16:39:09 UTC (rev 8445)
@@ -0,0 +1,8 @@
+Wapiti includes a convenience copy of json.js which is otherwise unused
+and non-free. For this reason the source is repacked. See the
+get-orig-source of debian/rules for details.
+
+The json.js file has been removed upstream in r150:
+  http://wapiti.svn.sourceforge.net/viewvc/wapiti?view=revision&revision=150
+which probably means it won't be present in the next upstream version if
+any such version is ever released.

Modified: packages/wapiti/trunk/debian/changelog
===================================================================
--- packages/wapiti/trunk/debian/changelog	2012-04-08 16:28:09 UTC (rev 8444)
+++ packages/wapiti/trunk/debian/changelog	2012-04-08 16:39:09 UTC (rev 8445)
@@ -1,13 +1,15 @@
-wapiti (2.2.1-1) UNRELEASED; urgency=low
+wapiti (2.2.1+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #550072).
   * Drop no longer relevant recommends.
   * Install wapiti-getcookie and wapiti-lswww commands.
   * Update patches (drop most because no longer relevant).
   * Install upstream manual page.
+  * Provide a get-orig-source target that drops the unused and non-free
+    json.js from the upstream tarball.
   * Update debian/watch file.
 
- -- Arthur de Jong <adejong at debian.org>  Sun, 08 Apr 2012 18:27:48 +0200
+ -- Arthur de Jong <adejong at debian.org>  Sun, 08 Apr 2012 18:38:48 +0200
 
 wapiti (1.1.6-4) unstable; urgency=low
 

Modified: packages/wapiti/trunk/debian/rules
===================================================================
--- packages/wapiti/trunk/debian/rules	2012-04-08 16:28:09 UTC (rev 8444)
+++ packages/wapiti/trunk/debian/rules	2012-04-08 16:39:09 UTC (rev 8445)
@@ -9,3 +9,20 @@
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog_Wapiti
+
+DEB_DEBIAN_DIR=$(dir $(firstword $(MAKEFILE_LIST)))
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog -l$(DEB_DEBIAN_DIR)/changelog \
+                               | sed -rne 's,^Version: ([^+-]+).*,\1,p')
+get-orig-source:
+	# download and unpack upstream tarball
+	uscan --noconf --force-download --rename --download-current-version --destdir=. $(DEB_DEBIAN_DIR)/..
+	rm -rf wapiti-$(DEB_UPSTREAM_VERSION)
+	tar -xf wapiti_$(DEB_UPSTREAM_VERSION).orig.tar.bz2
+	rm wapiti_$(DEB_UPSTREAM_VERSION).orig.tar.bz2
+	# remove non-free json.js
+	rm wapiti-$(DEB_UPSTREAM_VERSION)/src/report_template/includes/js/json.js
+	# create a new tarball
+	GZIP=--best tar -cz --owner root --group root --mode a+rX \
+	  -f wapiti_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz \
+	  wapiti-$(DEB_UPSTREAM_VERSION)
+	rm -rf wapiti-$(DEB_UPSTREAM_VERSION)

Modified: packages/wapiti/trunk/debian/watch
===================================================================
--- packages/wapiti/trunk/debian/watch	2012-04-08 16:28:09 UTC (rev 8444)
+++ packages/wapiti/trunk/debian/watch	2012-04-08 16:39:09 UTC (rev 8445)
@@ -1,2 +1,3 @@
 version=3
-http://sf.net/wapiti/wapiti-([\d+\.]+|\d+)\.tar\.(?:gz|bz2)
+opts=dversionmangle=s/\+dfsg$// \
+  http://sf.net/wapiti/wapiti-([\d+\.]+|\d+)\.tar\.(?:gz|bz2)