[Python-apps-commits] r4676 - in packages/ibid/trunk/debian (changelog copyright rules watch)

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

    Date: Friday, February 5, 2010 @ 10:08:49
  Author: stefanor-guest
Revision: 4676

Remove non-redistributable factpacks

Modified:
  packages/ibid/trunk/debian/changelog
  packages/ibid/trunk/debian/copyright
  packages/ibid/trunk/debian/rules
  packages/ibid/trunk/debian/watch

Modified: packages/ibid/trunk/debian/changelog
===================================================================
--- packages/ibid/trunk/debian/changelog	2010-02-04 22:19:44 UTC (rev 4675)
+++ packages/ibid/trunk/debian/changelog	2010-02-05 10:08:49 UTC (rev 4676)
@@ -1,4 +1,4 @@
-ibid (0+bzr876-1) UNRELEASED; urgency=low
+ibid (0+bzr876+dfsg-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #565885)
 

Modified: packages/ibid/trunk/debian/copyright
===================================================================
--- packages/ibid/trunk/debian/copyright	2010-02-04 22:19:44 UTC (rev 4675)
+++ packages/ibid/trunk/debian/copyright	2010-02-05 10:08:49 UTC (rev 4676)
@@ -10,6 +10,15 @@
  The complete Ibid package is released under the terms of the GPL license, as
  can be found in /usr/share/common-licenses/GPL-3. The core of Ibid is
  additionally available under the terms of the MIT/X/Expat license, as below.
+X-Repackage-Comment:
+ Some of the factpacks included in the upstream tarball contain quotes that
+ aren't licensed for redistribution. The following factpacks have been removed
+ from the Debian version of this package:
+  divine.json:    8 ball messages
+  handey.json:    Jack Handey quotes
+  overlord.json:  Overlord list
+  wrestling.json: Wrestling move list
+  zippy.json:     Zippy the Pinhead quotes
 
 Files: debian/*
 Copyright: 2008-2010, Michael Gorven, Stefano Rivera

Modified: packages/ibid/trunk/debian/rules
===================================================================
--- packages/ibid/trunk/debian/rules	2010-02-04 22:19:44 UTC (rev 4675)
+++ packages/ibid/trunk/debian/rules	2010-02-05 10:08:49 UTC (rev 4676)
@@ -30,11 +30,18 @@
 override_dh_compress:
 	dh_compress -X.js
 
+REV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*bzr([0-9]+).*,\1,p')
+VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: (.+)\+dfsg.*,\1,p')
+BZR_REPO?=lp:ibid
+
 get-orig-source:
-	REV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*bzr([^-]+).*,\1,p'); \
-	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p'); \
-	if [ "$$REV" = "" ]; then \
-		uscan --noconf --force-download --download-version=$$VER; \
+	if [ "$(REV)" = "" ]; then \
+		uscan --noconf --force-download --rename --download-version=$(VER) --destdir=.; \
 	else \
-		bzr export -r $$REV ibid_$$VER.orig.tar.gz lp:ibid; \
+		bzr export -r $(REV) ibid-$(VER).tar.gz $(BZR_REPO); \
+		mv ibid-$(VER).tar.gz ibid_$(VER).orig.tar.gz; \
 	fi
+	tar -xf ibid_$(VER).orig.tar.gz
+	cd ibid-$(VER)/factpacks/ && rm -f divine.json handey.json overlord.json wrestling.json zippy.json
+	GZIP=--best tar -czf ibid_$(VER)+dfsg.orig.tar.gz ibid-$(VER)
+	rm -rf ibid-$(VER) ibid_$(VER).orig.tar.gz

Modified: packages/ibid/trunk/debian/watch
===================================================================
--- packages/ibid/trunk/debian/watch	2010-02-04 22:19:44 UTC (rev 4675)
+++ packages/ibid/trunk/debian/watch	2010-02-05 10:08:49 UTC (rev 4676)
@@ -1,4 +1,5 @@
 version=3
 
+dversionmangle=s/\+dfsg// \
 https://launchpad.net/ibid/+download \
 http://launchpad.net/ibid/.*/ibid-(.*).tar.gz