[Python-modules-commits] r15463 - in packages/pystemmer/trunk/debian (6 files)

Sat Feb 5 13:55:23 UTC 2011

Date: Saturday, February 5, 2011 @ 13:55:16
  Author: stefanor
Revision: 15463

* Switch to dh_python2.
  - Use X-Python-Version. BD on python >= 2.6.5-13.
* Update my e-mail address.
* Bump Standards-Version to 3.9.1, no changes needed.
* Update copyright format.

Modified:
  packages/pystemmer/trunk/debian/changelog
  packages/pystemmer/trunk/debian/control
  packages/pystemmer/trunk/debian/copyright
  packages/pystemmer/trunk/debian/patches/link-libstemmer.diff
  packages/pystemmer/trunk/debian/patches/test-exit-code.diff
  packages/pystemmer/trunk/debian/rules

Modified: packages/pystemmer/trunk/debian/changelog
===================================================================

--- packages/pystemmer/trunk/debian/changelog	2011-02-05 13:44:26 UTC (rev 15462)
+++ packages/pystemmer/trunk/debian/changelog	2011-02-05 13:55:16 UTC (rev 15463)
@@ -1,9 +1,13 @@
 pystemmer (1.1.0+dfsg-2) UNRELEASED; urgency=low
 
   * Forwarded test-exit-code.diff
-  * Fix FTBFS with nostrip build option.
+  * Switch to dh_python2.
+    - Use X-Python-Version. BD on python >= 2.6.5-13.
+  * Update my e-mail address.
+  * Bump Standards-Version to 3.9.1, no changes needed.
+  * Update copyright format.
 
- -- Stefano Rivera <stefano at rivera.za.net>  Thu, 29 Apr 2010 09:18:57 +0200
+ -- Stefano Rivera <stefanor at debian.org>  Sat, 05 Feb 2011 15:53:49 +0200
 
 pystemmer (1.1.0+dfsg-1) unstable; urgency=low
 

Modified: packages/pystemmer/trunk/debian/control
===================================================================
--- packages/pystemmer/trunk/debian/control	2011-02-05 13:44:26 UTC (rev 15462)
+++ packages/pystemmer/trunk/debian/control	2011-02-05 13:55:16 UTC (rev 15463)
@@ -2,12 +2,16 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Stefano Rivera <stefano at rivera.za.net>
-Build-Depends: debhelper (>= 7.3.5~), libstemmer-dev,
- python-support (>= 0.90), python-all-dev, python-all-dbg, python-pyrex,
- python-epydoc
-XS-Python-Version: >= 2.4
-Standards-Version: 3.8.4
+Uploaders: Stefano Rivera <stefanor at debian.org>
+Build-Depends:
+ debhelper (>= 7.3.5~),
+ libstemmer-dev,
+ python-all-dbg,
+ python-all-dev (>= 2.6.5-13~),
+ python-epydoc,
+ python-pyrex
+X-Python-Version: >= 2.4
+Standards-Version: 3.9.1
 Homepage: http://snowball.tartarus.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pystemmer/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pystemmer/trunk/
@@ -15,6 +19,7 @@
 Package: python-stemmer
 Architecture: any
 Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Breaks: ${python:Breaks}
 Description: Python bindings for libstemmer - snowball stemming algorithms
  PyStemmer provides access to efficient algorithms for calculating a "stemmed"
  form of a word.  This is a form with most of the common morphological endings
@@ -35,8 +40,12 @@
 Section: debug
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends},
- python-stemmer (= ${binary:Version})
+Depends:
+ python-stemmer (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: ${python:Breaks}
 Recommends: python-dbg
 Description: Python bindings for libstemmer - snowball stemming algorithms (debug extension)
  PyStemmer provides access to efficient algorithms for calculating a "stemmed"

Modified: packages/pystemmer/trunk/debian/copyright
===================================================================
--- packages/pystemmer/trunk/debian/copyright	2011-02-05 13:44:26 UTC (rev 15462)
+++ packages/pystemmer/trunk/debian/copyright	2011-02-05 13:55:16 UTC (rev 15463)
@@ -1,26 +1,26 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-Name: PyStemmer
-Maintainer: Richard Boulton <richard at tartarus.org>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=166
+Upstream-Name: PyStemmer
+Upstream-Contact: Richard Boulton <richard at tartarus.org>
 Source: http://snowball.tartarus.org/
+Comment: Repackaged:
+ 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: *
 Copyright: 2006, Richard Boulton
-License: MIT
-X-Inspiration:
+License: Expat
+Comment:
  It was inspired by an earlier implementation of PyStemmer (version 0.10, which
  was copyright (c) 2001, Andreas Jung, and also licensed under the MIT license,
  but no portions of which remain in this package, and had a different API).
  .
  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: sampledata/englishvoc.txt
 Copyright: 2001-2006, Dr Martin Porter and Richard Boulton
-License: BSD
+License:
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  1. Redistributions of source code must retain the above copyright notice, this
@@ -48,11 +48,10 @@
  Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas
  Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, Justin Bradford, Ben
  Harris, Malcolm Smith, Ahmad Khalifa, Markus Kuhn, and CORE SDI S.A.
-License: MIT
+License: Expat
 
 Files: debian/*
-Copyright:
- 2010, Stefano Rivera <stefano at rivera.za.net>
+Copyright: 2010-2011, Stefano Rivera <stefanor at debian.org>
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -67,7 +66,7 @@
  On Debian systems, the complete text of the GNU General Public License
  version 2 can be found in the /usr/share/common-licenses/GPL-2 file.
 
-License: MIT
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights

Modified: packages/pystemmer/trunk/debian/patches/link-libstemmer.diff
===================================================================
--- packages/pystemmer/trunk/debian/patches/link-libstemmer.diff	2011-02-05 13:44:26 UTC (rev 15462)
+++ packages/pystemmer/trunk/debian/patches/link-libstemmer.diff	2011-02-05 13:55:16 UTC (rev 15463)
@@ -1,8 +1,8 @@
 Description: Dynamically Link against libstemmer rather than using included
  libstemmer_c sources.
-Author: Stefano Rivera <stefano at rivera.za.net>
+Author: Stefano Rivera <stefanor at debian.org>
 Forwarded: no
-Last-Update: 2010-03-08
+Last-Update: 2012-02-05
 
 --- a/setup.py
 +++ b/setup.py

Modified: packages/pystemmer/trunk/debian/patches/test-exit-code.diff
===================================================================
--- packages/pystemmer/trunk/debian/patches/test-exit-code.diff	2011-02-05 13:44:26 UTC (rev 15462)
+++ packages/pystemmer/trunk/debian/patches/test-exit-code.diff	2011-02-05 13:55:16 UTC (rev 15463)
@@ -1,7 +1,7 @@
 Description: Modify the test suite to return a suitable error code on failure.
-Author: Stefano Rivera <stefano at rivera.za.net>
+Author: Stefano Rivera <stefanor at debian.org>
 Forwarded: yes
-Last-Update: 1010-02-27
+Last-Update: 2011-02-05
 
 --- a/runtests.py
 +++ b/runtests.py

Modified: packages/pystemmer/trunk/debian/rules
===================================================================
--- packages/pystemmer/trunk/debian/rules	2011-02-05 13:44:26 UTC (rev 15462)
+++ packages/pystemmer/trunk/debian/rules	2011-02-05 13:55:16 UTC (rev 15463)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with python2
 
 override_dh_auto_build:
 	# Rebuild from Pyrex source
@@ -32,10 +32,7 @@
 	dh_compress -X.js
 
 override_dh_strip:
-ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip --dbg-package=python-stemmer-dbg
-	cd debian/*-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
-endif
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=python-stemmer


