[Python-modules-commits] r6499 - in packages/pyglet/trunk/debian (5 files)

Sun Sep 14 12:04:26 UTC 2008

Date: Sunday, September 14, 2008 @ 12:04:23
  Author: speijnik-guest
Revision: 6499

Preparing python-pyglet 1.1.1.dfsg-1.

Modified:
  packages/pyglet/trunk/debian/TODO
  packages/pyglet/trunk/debian/changelog
  packages/pyglet/trunk/debian/control
  packages/pyglet/trunk/debian/rules
  packages/pyglet/trunk/debian/watch

Modified: packages/pyglet/trunk/debian/TODO
===================================================================

--- packages/pyglet/trunk/debian/TODO	2008-09-14 10:10:01 UTC (rev 6498)
+++ packages/pyglet/trunk/debian/TODO	2008-09-14 12:04:23 UTC (rev 6499)
@@ -14,8 +14,6 @@
 package dependencies.
 
 
-Package contains documentation without the corresponding sources. It either
-has to be removed or sources have to be included. Request to upstream was sent.
-
-Upstream decided not to ship sources in the tarball, so we need to repackage it
-and remove the doc dir.
+Package contains examples which use resources, such as sound or image files,
+wich are explicitly marked as being non-free, so we need to repackage
+it and remove those directories.

Modified: packages/pyglet/trunk/debian/changelog
===================================================================
--- packages/pyglet/trunk/debian/changelog	2008-09-14 10:10:01 UTC (rev 6498)
+++ packages/pyglet/trunk/debian/changelog	2008-09-14 12:04:23 UTC (rev 6499)
@@ -1,9 +1,16 @@
-pyglet (1.1.1-1) UNRELEASED; urgency=low
+pyglet (1.1.1.dfsg-1) unstable; urgency=low
 
-  * (NOT RELEASED YET) New upstream release (Closes: #494367).
-  * Added myself as uploader.
+  * New upstream release (Closes: #494367).
+  * Updated debian/control: 
+    - Added myself as uploader. 
+    - Updated Standards-Version.
+  * Updated debian/rules: Updated get-orig-sources to remove non-free examples.
+  * Updated debian/TODO: 
+    - Removed note about documentation
+    - Added information about non-free files being removed.
+  * Updated debian/watch: Added dversionmangle option.
 
- -- Stephan Peijnik <debian at sp.or.at>  Sat, 13 Sep 2008 17:54:24 +0200
+ -- Stephan Peijnik <debian at sp.or.at>  Sun, 14 Sep 2008 14:01:26 +0200
 
 pyglet (1.0.dfsg-1) unstable; urgency=low
 

Modified: packages/pyglet/trunk/debian/control
===================================================================
--- packages/pyglet/trunk/debian/control	2008-09-14 10:10:01 UTC (rev 6498)
+++ packages/pyglet/trunk/debian/control	2008-09-14 12:04:23 UTC (rev 6499)
@@ -2,9 +2,11 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Hanke <michael.hanke at gmail.com>, Per B. Sederberg <psederberg at gmail.com>, Ondrej Certik <ondrej at certik.cz>, Stephan Peijnik <debian at sp.or.at>
+Uploaders: Michael Hanke <michael.hanke at gmail.com>, 
+	   Per B. Sederberg <psederberg at gmail.com>, 
+	   Ondrej Certik <ondrej at certik.cz>, Stephan Peijnik <debian at sp.or.at>
 Build-Depends: cdbs, debhelper (>= 5), python-support (>= 0.6), python
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://www.pyglet.org
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyglet/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pyglet/trunk/?op=log

Modified: packages/pyglet/trunk/debian/rules
===================================================================
--- packages/pyglet/trunk/debian/rules	2008-09-14 10:10:01 UTC (rev 6498)
+++ packages/pyglet/trunk/debian/rules	2008-09-14 12:04:23 UTC (rev 6499)
@@ -10,8 +10,21 @@
 DEB_INSTALL_CHANGELOGS_ALL := CHANGELOG
 
 get-orig-sources:
-	wget http://pyglet.googlecode.com/files/pyglet-1.0.tar.gz
-	tar xzf pyglet-1.0.tar.gz
-	rm -rf pyglet-1.0/doc/
-	tar czf pyglet_1.0.dfsg.orig.tar.gz pyglet-1.0
-	rm -r pyglet-1.0 pyglet-1.0.tar.gz
+	wget http://pyglet.googlecode.com/files/pyglet-1.1.1.tar.gz
+	tar xzf pyglet-1.1.1.tar.gz
+	# Remove examples with unclean licensing.
+	#
+	# Resources (images, sound files, etc.) needed by these examples
+	# have no license attached and thus are non-free.
+	rm -rf pyglet-1.1.1/examples/astraea/
+	rm -rf pyglet-1.1.1/examples/noisy/
+	rm -rf pyglet-1.1.1/examples/soundspace/
+	rm -f pyglet-1.1.1/examples/pyglet.png
+	rm -f pyglet-1.1.1/examples/programming_guide/dinosaur.gif
+	rm -f pyglet-1.1.1/examples/programming_guide/kitten.jpg
+
+	# Remove tools that come without copyright and/or license notice.
+	rm -f pyglet-1.1.1/tools/inspect_font.py
+
+	tar czf pyglet_1.1.1.dfsg.orig.tar.gz pyglet-1.1.1
+	rm -r pyglet-1.1.1 pyglet-1.1.1.tar.gz

Modified: packages/pyglet/trunk/debian/watch
===================================================================
--- packages/pyglet/trunk/debian/watch	2008-09-14 10:10:01 UTC (rev 6498)
+++ packages/pyglet/trunk/debian/watch	2008-09-14 12:04:23 UTC (rev 6499)
@@ -1,2 +1,4 @@
 version=3
-http://code.google.com/p/pyglet/ http://pyglet.googlecode.com/files/pyglet-(.*)\.tar\.gz
+opts=dversionmangle=s/\.dfsg\.\d+$// \
+     http://code.google.com/p/pyglet/ \
+     http://pyglet.googlecode.com/files/pyglet-(.*)\.tar\.gz


