[Python-modules-commits] r10022 - in packages/stdeb/trunk/debian (9 files)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Sun Oct 11 16:41:33 UTC 2009 

    Date: Sunday, October 11, 2009 @ 16:41:32
  Author: piotr
Revision: 10022

add bump_debhelper_compat_level and remove_pycentral_dependency patches

Added:
  packages/stdeb/trunk/debian/README.source
  packages/stdeb/trunk/debian/copyright
  packages/stdeb/trunk/debian/patches/
  packages/stdeb/trunk/debian/patches/bump_debhelper_compat_level.patch
  packages/stdeb/trunk/debian/patches/remove_pycentral_dependency.patch
  packages/stdeb/trunk/debian/patches/series
Modified:
  packages/stdeb/trunk/debian/changelog
  packages/stdeb/trunk/debian/control
  packages/stdeb/trunk/debian/rules

Added: packages/stdeb/trunk/debian/README.source
===================================================================
--- packages/stdeb/trunk/debian/README.source	                        (rev 0)
+++ packages/stdeb/trunk/debian/README.source	2009-10-11 16:41:32 UTC (rev 10022)
@@ -0,0 +1,2 @@
+This package uses the patch management system quilt as documented in
+/usr/share/doc/quilt/README.source.

Modified: packages/stdeb/trunk/debian/changelog
===================================================================
--- packages/stdeb/trunk/debian/changelog	2009-10-11 12:22:28 UTC (rev 10021)
+++ packages/stdeb/trunk/debian/changelog	2009-10-11 16:41:32 UTC (rev 10022)
@@ -2,4 +2,4 @@
 
   * Initial release (closes: #550353)
 
- -- Piotr Ożarowski <piotr at debian.org>  Fri, 09 Oct 2009 21:01:00 +0200
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 11 Oct 2009 18:13:02 +0200

Modified: packages/stdeb/trunk/debian/control
===================================================================
--- packages/stdeb/trunk/debian/control	2009-10-11 12:22:28 UTC (rev 10021)
+++ packages/stdeb/trunk/debian/control	2009-10-11 16:41:32 UTC (rev 10022)
@@ -3,17 +3,17 @@
 Priority: optional
 Maintainer: Piotr Ożarowski <piotr at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: python, python-support (>= 0.6.4), python-setuptools
+Build-Depends: debhelper (>= 7.0.50~), quilt, python
+Build-Depends-Indep: python-support (>= 0.6.4), python-setuptools, help2man
 Standards-Version: 3.8.3
-Homepage: http://www.stdebtemplates.org/
-XS-Python-Version: >= 2.4
+Homepage: http://github.com/astraw/stdeb
+XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/stdeb/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/stdeb/trunk/
 
 Package: python-stdeb
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, python-setuptools
 Description: Python to Debian source package conversion utility
  stdeb produces Debian source packages from Python packages via a new distutils
  command, sdist_dsc. Automatic defaults are provided for the Debian package,

Added: packages/stdeb/trunk/debian/copyright
===================================================================
--- packages/stdeb/trunk/debian/copyright	                        (rev 0)
+++ packages/stdeb/trunk/debian/copyright	2009-10-11 16:41:32 UTC (rev 10022)
@@ -0,0 +1,35 @@
+This package was debianized by Piotr Ożarowski <piotr at debian.org> on
+Fri, 09 Oct 2009 21:01:00 +0200.
+
+It was downloaded from http://pypi.python.org/packages/source/s/stdeb/
+
+Author: Andrew Straw <strawman at astraw.com>
+
+License:
+
+ Copyright (c) 2006-2008 stdeb authors.
+ 
+ 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 to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+The Debian packaging is © 2009, Piotr Ożarowski <piotr at debian.org> and
+is licensed under the BSD.
+
+On Debian systems, the complete text of the BSD License can be found in
+`/usr/share/common-licenses/BSD'

Added: packages/stdeb/trunk/debian/patches/bump_debhelper_compat_level.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/bump_debhelper_compat_level.patch	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/bump_debhelper_compat_level.patch	2009-10-11 16:41:32 UTC (rev 10022)
@@ -0,0 +1,13 @@
+Index: stdeb-0.4.1/stdeb/util.py
+===================================================================
+--- stdeb-0.4.1.orig/stdeb/util.py
++++ stdeb-0.4.1/stdeb/util.py
+@@ -902,7 +902,7 @@ def build_dsc(debinfo,
+ 
+     #    D. debian/compat
+     fd = open( os.path.join(debian_dir,'compat'), mode='w')
+-    fd.write('4\n')
++    fd.write('7\n')
+     fd.close()
+ 
+     #    E. debian/package.mime

Added: packages/stdeb/trunk/debian/patches/remove_pycentral_dependency.patch
===================================================================
--- packages/stdeb/trunk/debian/patches/remove_pycentral_dependency.patch	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/remove_pycentral_dependency.patch	2009-10-11 16:41:32 UTC (rev 10022)
@@ -0,0 +1,27 @@
+# no need to depend on python-central, previous package depended on it, so
+# `which pycentral` check should be enough
+Index: stdeb-0.4.1/stdeb/util.py
+===================================================================
+--- stdeb-0.4.1.orig/stdeb/util.py
++++ stdeb-0.4.1/stdeb/util.py
+@@ -555,8 +555,8 @@ class DebianInfo:
+         need_custom_binary_target = False
+ 
+         self.do_pycentral_removal_preinst = pycentral_backwards_compatibility
+-        if pycentral_backwards_compatibility:
+-            depends.append('python-central')
++        #if pycentral_backwards_compatibility:
++        #    depends.append('python-central')
+ 
+         if has_ext_modules:
+             self.architecture = 'any'
+@@ -1087,7 +1087,8 @@ set -e
+ # pycentral does not remove normally remove its symlinks on an
+ # upgrade. Since we're using python-support, however, those symlinks
+ # will be broken. This tells python-central to clean up any symlinks.
+-if [ -e /var/lib/dpkg/info/%(package)s.list ]; then
++if [ -e /var/lib/dpkg/info/%(package)s.list ] && which pycentral >/dev/null 2>&1
++then
+     pycentral pkgremove %(package)s
+ fi
+ 

Added: packages/stdeb/trunk/debian/patches/series
===================================================================
--- packages/stdeb/trunk/debian/patches/series	                        (rev 0)
+++ packages/stdeb/trunk/debian/patches/series	2009-10-11 16:41:32 UTC (rev 10022)
@@ -0,0 +1,2 @@
+remove_pycentral_dependency.patch
+bump_debhelper_compat_level.patch

Modified: packages/stdeb/trunk/debian/rules
===================================================================
--- packages/stdeb/trunk/debian/rules	2009-10-11 12:22:28 UTC (rev 10021)
+++ packages/stdeb/trunk/debian/rules	2009-10-11 16:41:32 UTC (rev 10022)
@@ -1,3 +1,22 @@
 #!/usr/bin/make -f
+
 %:
-	dh $@
+	dh --with quilt $@
+
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+help2man = PYTHONPATH=${CURDIR} help2man -N --version-string=${DEB_UPSTREAM_VERSION} \
+		-o $1 -n '$2' $(CURDIR)/debian/python-stdeb/usr/bin/$(subst .1,,$1)
+
+py2dsc.1:
+	$(call help2man,$@,creates Debian source package from Python package)
+
+stdeb_run_setup.1:
+	$(call help2man,$@,calls "python setup.py sdist_dsc" ensuring stdeb is available)
+
+override_dh_installman: py2dsc.1 stdeb_run_setup.1
+	dh_installman py2dsc.1 stdeb_run_setup.1
+
+clean:
+	rm -f py2dsc.1 stdeb_run_setup.1
+	dh --with quilt $@
+

More information about the Python-modules-commits mailing list