[Python-modules-commits] r2878 - in /packages/python-pygraphviz/trunk/debian: changelog rules

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

Author: kibi-guest
Date: Sat Jul 28 11:47:10 2007
New Revision: 2878

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2878
Log:
Handle the repack, cleanup a bit

Modified:
    packages/python-pygraphviz/trunk/debian/changelog
    packages/python-pygraphviz/trunk/debian/rules

Modified: packages/python-pygraphviz/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pygraphviz/trunk/debian/changelog?rev=2878&op=diff
==============================================================================
--- packages/python-pygraphviz/trunk/debian/changelog (original)
+++ packages/python-pygraphviz/trunk/debian/changelog Sat Jul 28 11:47:10 2007
@@ -1,6 +1,8 @@
-python-pygraphviz (0.35-1) unstable; urgency=low
+python-pygraphviz (0.35.dfsg-1) unstable; urgency=low
 
   * New upstream release.
+  * Repack since an example is not DFSG-free: freely distributable but no
+    modifications are allowed.
   * Dropped patches (two backports and a patch included upstream):
      + 1_SEGV_backported_fix_r590.diff
      + 2_pkg-config_backported_fix_r605.diff
@@ -10,6 +12,11 @@
        until the next need for patches).
      + Dropped DEFAULT_PYTHON, which was used when python-support was still
        unable to handle eggs properly.
+     + Replaced DEB_UPSTREAM_VERSION by DEB_REAL_UPSTREAM_VERSION, so as to
+       handle the '.dfsg' suffix, due to the repack, since cdbs handles
+       DEB_UPSTREAM_VERSION on its own.
+     + Dropped DEB_COMPRESS_EXCLUDE since now pygraphviz can handle compressed
+       data, and since the example file is the one being removed.
   * debian/watch:
      + Updated, with the addition pygraphviz/ directory.
 

Modified: packages/python-pygraphviz/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pygraphviz/trunk/debian/rules?rev=2878&op=diff
==============================================================================
--- packages/python-pygraphviz/trunk/debian/rules (original)
+++ packages/python-pygraphviz/trunk/debian/rules Sat Jul 28 11:47:10 2007
@@ -2,8 +2,8 @@
 
 # Commodity variables
 DOC_INSTDIR=$(CURDIR)/debian/python-pygraphviz/usr/share/doc
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
-        | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
+DEB_REAL_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
+        | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1 | sed -e 's/\.dfsg$$//')
 
 # Needed before including python-distutils.mk
 DEB_PYTHON_SYSTEM = pysupport
@@ -25,14 +25,11 @@
 DEB_PYSUPPORT_DIR            = $(CURDIR)/debian/python-pygraphviz/usr/share/python-support/python-pygraphviz
 DEB_PYSUPPORT_LIB_DIR        = $(CURDIR)/debian/python-pygraphviz/usr/lib/python-support/python-pygraphviz
 
-# Do not compress the example data file
-DEB_COMPRESS_EXCLUDE        += .dat
-
 binary-install/python-pygraphviz::
 	# Move the documentation
-	mv $(DOC_INSTDIR)/pygraphviz-$(DEB_UPSTREAM_VERSION)/* \
+	mv $(DOC_INSTDIR)/pygraphviz-$(DEB_REAL_UPSTREAM_VERSION)/* \
 		$(DOC_INSTDIR)/python-pygraphviz
-	rmdir $(DOC_INSTDIR)/pygraphviz-$(DEB_UPSTREAM_VERSION)
+	rmdir $(DOC_INSTDIR)/pygraphviz-$(DEB_REAL_UPSTREAM_VERSION)
 	
 	# Remove extraneous license file, and rename the README file
 	rm $(DOC_INSTDIR)/python-pygraphviz/License.txt