[Python-modules-commits] r12266 - in packages/pystemmer (5 files)

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

    Date: Sunday, March 14, 2010 @ 14:32:03
  Author: stefanor-guest
Revision: 12266

DFSG release, removing libstemmer_c

Modified:
  packages/pystemmer/trunk/debian/changelog
  packages/pystemmer/trunk/debian/copyright
  packages/pystemmer/trunk/debian/rules
  packages/pystemmer/trunk/debian/watch
Deleted:
  packages/pystemmer/tags/1.1.0-1/

Modified: packages/pystemmer/trunk/debian/changelog
===================================================================
--- packages/pystemmer/trunk/debian/changelog	2010-03-14 11:14:25 UTC (rev 12265)
+++ packages/pystemmer/trunk/debian/changelog	2010-03-14 14:32:03 UTC (rev 12266)
@@ -1,5 +1,5 @@
-pystemmer (1.1.0-1) unstable; urgency=low
+pystemmer (1.1.0+dfsg-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #375441)
 
- -- Stefano Rivera <stefano at rivera.za.net>  Sat, 13 Mar 2010 20:34:16 +0200
+ -- Stefano Rivera <stefano at rivera.za.net>  Sun, 14 Mar 2010 16:31:11 +0200

Modified: packages/pystemmer/trunk/debian/copyright
===================================================================
--- packages/pystemmer/trunk/debian/copyright	2010-03-14 11:14:25 UTC (rev 12265)
+++ packages/pystemmer/trunk/debian/copyright	2010-03-14 14:32:03 UTC (rev 12266)
@@ -13,8 +13,12 @@
  .
  Both Andreas Jung's implementation and this implementation are covered by the
  MIT license.
+X-Repackage-Comment:
+ Removed bundled libstemmer_c from source, as we build against Debian's
+ libstemmer shared library. libstemmer_c was generated from Snowball source,
+ but the source wasn't included, violating DFSG #2.
 
-Files: libstemmer_c/*, sampledata/englishvoc.txt
+Files: sampledata/englishvoc.txt
 Copyright: 2001-2006, Dr Martin Porter and Richard Boulton
 License: BSD
  Redistribution and use in source and binary forms, with or without

Modified: packages/pystemmer/trunk/debian/rules
===================================================================
--- packages/pystemmer/trunk/debian/rules	2010-03-14 11:14:25 UTC (rev 12265)
+++ packages/pystemmer/trunk/debian/rules	2010-03-14 14:32:03 UTC (rev 12266)
@@ -5,9 +5,7 @@
 
 override_dh_auto_build:
 	# Rebuild from Pyrex source
-	rm -f src/Stemmer.c
-	# We use Debian's libstemmer
-	rm -rf libstemmer_c
+	rm -f src/*.c
 	dh_auto_build
 	mkdir -p debian/html/api
 	epydoc --html -o debian/html/api --name="PyStemmer" \
@@ -39,3 +37,13 @@
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=python-stemmer
+
+get-orig-source:
+	set -e; \
+	VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p'); \
+	uscan --noconf --force-download --rename --download-version=$$VER --destdir=.; \
+	tar -x --exclude=libstemmer_c -f pystemmer_$$VER.orig.tar.gz; \
+	rm -f pystemmer_$$VER.orig.tar.gz; \
+	GZIP=--best tar -cz --owner root --group root --mode a+rX \
+	    -f pystemmer_$$VER+dfsg.orig.tar.gz PyStemmer-$$VER; \
+	rm -rf PyStemmer-$$VER

Modified: packages/pystemmer/trunk/debian/watch
===================================================================
--- packages/pystemmer/trunk/debian/watch	2010-03-14 11:14:25 UTC (rev 12265)
+++ packages/pystemmer/trunk/debian/watch	2010-03-14 14:32:03 UTC (rev 12266)
@@ -1,3 +1,4 @@
 version=3
 
+opts=dversionmangle=s/\+dfsg// \
 http://pypi.python.org/packages/source/P/PyStemmer/PyStemmer-(.*)\.tar.gz