[Python-modules-commits] r8550 - in packages/pyro/trunk/debian (6 files)

Sat May 23 11:00:28 UTC 2009

Date: Saturday, May 23, 2009 @ 11:00:24
  Author: bzed
Revision: 8550

* Switching to python-support and dh 7.
* Bumping Standards-Version to 3.8.1. 
* Dropping maintainer scripts, dh creates them properly. 
* Adding missing ${misc:Depends}. 

Modified:
  packages/pyro/trunk/debian/changelog
  packages/pyro/trunk/debian/control
  packages/pyro/trunk/debian/rules
Deleted:
  packages/pyro/trunk/debian/pyro.postinst
  packages/pyro/trunk/debian/pyro.postrm
  packages/pyro/trunk/debian/pyro.prerm

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

--- packages/pyro/trunk/debian/changelog	2009-05-21 20:29:48 UTC (rev 8549)
+++ packages/pyro/trunk/debian/changelog	2009-05-23 11:00:24 UTC (rev 8550)
@@ -1,4 +1,4 @@
-pyro (3.9-1) UNRELEASED; urgency=low
+pyro (3.9.1-1) UNRELEASED; urgency=low
 
   [ Sandro Tosi ]
   * debian/control
@@ -10,8 +10,12 @@
     - Dropping patch, applied usptream. 
   * debian/control, debian/rules:
     - Dropping dpatch build-dep and include, not needed anymore. 
+  * Switching to python-support and dh 7.
+  * Bumping Standards-Version to 3.8.1. 
+  * Dropping maintainer scripts, dh creates them properly. 
+  * Adding missing ${misc:Depends}. 
 
- -- Bernd Zeimetz <bzed at debian.org>  Sun, 12 Apr 2009 13:32:34 +0200
+ -- Bernd Zeimetz <bzed at debian.org>  Sat, 23 May 2009 13:02:39 +0200
 
 pyro (3.7-2) unstable; urgency=medium
 

Modified: packages/pyro/trunk/debian/control
===================================================================
--- packages/pyro/trunk/debian/control	2009-05-21 20:29:48 UTC (rev 8549)
+++ packages/pyro/trunk/debian/control	2009-05-23 11:00:24 UTC (rev 8550)
@@ -3,18 +3,16 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 5.0.42), python
-Build-Depends-Indep: python-central (>= 0.6), xsltproc, docbook-xsl
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7.0.50), python-all
+Build-Depends-Indep: python-support (>= 0.71), xsltproc, docbook-xsl
+Standards-Version: 3.8.1
 Homepage: http://pyro.sourceforge.net
-XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyro/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyro/trunk/
 
 Package: pyro
 Architecture: all
-XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}
+Depends: ${python:Depends}, ${misc:Depends}
 Suggests: pyro-gui, pyro-doc
 Description: distributed object system for Python
  Pyro (PYthon Remote Object) is an easy to use and powerful distributed object
@@ -35,8 +33,7 @@
 
 Package: pyro-gui
 Architecture: all
-XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, pyro, python-tk, python-wxgtk2.6
+Depends: ${python:Depends}, ${misc:Depends}, pyro, python-tk, python-wxgtk2.6
 Description: graphicals tool for Pyro
  Pyro (PYthon Remote Object) is an easy to use and powerful distributed object
  system for Python.
@@ -49,6 +46,7 @@
 Architecture: all
 Section: doc
 Suggests: pyro
+Depends: ${misc:Depends}
 Description: documentation for Pyro
  Pyro (PYthon Remote Object) is an easy to use and powerful distributed object
  system for Python.
@@ -57,7 +55,7 @@
 
 Package: pyro-examples
 Architecture: all
-Depends: pyro
+Depends: pyro, ${misc:Depends}
 Description: examples for Pyro
  Pyro (PYthon Remote Object) is an easy to use and powerful distributed object
  system for Python.

Deleted: packages/pyro/trunk/debian/pyro.postinst
===================================================================
--- packages/pyro/trunk/debian/pyro.postinst	2009-05-21 20:29:48 UTC (rev 8549)
+++ packages/pyro/trunk/debian/pyro.postinst	2009-05-23 11:00:24 UTC (rev 8550)
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Workaround needed because postinst and prerm are written by debhelper in the
-# same order (instead of reverse order).
-
-# Let's pycentral do its work first. 
-#DEBHELPER#
-
-if [ -x "/etc/init.d/pyro-nsd" ]; then
-	update-rc.d pyro-nsd defaults >/dev/null
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d pyro-nsd start || exit $?
-	else
-		/etc/init.d/pyro-nsd start || exit $?
-	fi
-fi
-

Deleted: packages/pyro/trunk/debian/pyro.postrm
===================================================================
--- packages/pyro/trunk/debian/pyro.postrm	2009-05-21 20:29:48 UTC (rev 8549)
+++ packages/pyro/trunk/debian/pyro.postrm	2009-05-23 11:00:24 UTC (rev 8550)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Workaround needed because postinst and prerm are written by debhelper in the
-# same order (instead of reverse order).
-
-if [ "$1" = "purge" ] ; then
-	update-rc.d pyro-nsd remove >/dev/null || exit $?
-fi
-
-#DEBHELPER#

Deleted: packages/pyro/trunk/debian/pyro.prerm
===================================================================
--- packages/pyro/trunk/debian/pyro.prerm	2009-05-21 20:29:48 UTC (rev 8549)
+++ packages/pyro/trunk/debian/pyro.prerm	2009-05-23 11:00:24 UTC (rev 8550)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Workaround needed because postinst and prerm are written by debhelper in the
-# same order (instead of reverse order).
-
-if [ -x "/etc/init.d/pyro-nsd" ]; then
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d pyro-nsd stop || exit $?
-	else
-		/etc/init.d/pyro-nsd stop || exit $?
-	fi
-fi
-
-# Let's pycentral do its work then.
-#DEBHELPER#
-

Modified: packages/pyro/trunk/debian/rules
===================================================================
--- packages/pyro/trunk/debian/rules	2009-05-21 20:29:48 UTC (rev 8549)
+++ packages/pyro/trunk/debian/rules	2009-05-23 11:00:24 UTC (rev 8550)
@@ -1,85 +1,37 @@
 #!/usr/bin/make -f
-# This debian/rules file is based on a
-# sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
-PYTHON = /usr/bin/python
-
 DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
 XP=xsltproc -''-nonet
 
 %.1: %.1.xml
 	$(XP) -o $@ $(DB2MAN) $< 
 
-build: build-stamp
-build-stamp: debian/pyro-gui.1
+%:
+	dh $@
+
+build: debian/pyro-gui.1
 	dh_testdir
 	[ -r setup.cfg.upstream ] || cp setup.cfg setup.cfg.upstream
 	cp debian/setup.cfg .
-	touch build-stamp
+	dh $@
 
 clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	rm -fr build debian/pyro-gui.1
-	python setup.py clean
+	dh $@
+	rm -f build debian/pyro-gui.1
 	[ ! -r setup.cfg.upstream ] || mv setup.cfg.upstream setup.cfg
-	find . -name *\.py[co] -exec rm {} \;
 
-	dh_clean
+#install: build
+	#install -d debian/tmp/`pycentral pycentraldir pyro-gui`/Pyro
+	#dh_install --sourcedir=debian/tmp -ppyro $(shell pycentral pycentraldir pyro) -Xwxnsc.py -Xxnsc.py
+	#dh_install --sourcedir=debian/tmp -ppyro-gui $(shell pycentral pycentraldir pyro)/Pyro/xnsc.py
+	#dh_install --sourcedir=debian/tmp -ppyro-gui $(shell pycentral pycentraldir pyro)/Pyro/wxnsc.py
+	#dh_install -ppyro-examples
+	#dh_install -ppyro-doc -X docs/LICENSE docs/* usr/share/doc/pyro/html
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
 
-	# Add here commands to install the package into debian/pyro.
-	$(PYTHON) setup.py install --no-compile --root debian/tmp \
-		--install-lib     `pycentral pycentraldir pyro` \
-		--install-data    `pycentral pycentraldir pyro` \
-		--install-scripts /usr/bin
-	# Move what belongs to pyro-gui
-	install -d debian/tmp/`pycentral pycentraldir pyro-gui`/Pyro
-	dh_install --sourcedir=debian/tmp -ppyro $(shell pycentral pycentraldir pyro) -Xwxnsc.py -Xxnsc.py
-	dh_install --sourcedir=debian/tmp -ppyro-gui $(shell pycentral pycentraldir pyro)/Pyro/xnsc.py
-	dh_install --sourcedir=debian/tmp -ppyro-gui $(shell pycentral pycentraldir pyro)/Pyro/wxnsc.py
-	dh_install -ppyro-examples
-	dh_install -ppyro-doc -X docs/LICENSE docs/* usr/share/doc/pyro/html
+override_dh_installinit:
+	dh_installinit -ppyro --name=pyro-nsd
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installman -ppyro debian/pyro.1
-	dh_installman -ppyro-gui debian/pyro-gui.1
-	# --noscripts needed because debhelper write postinst and prerm
-	# in the same order (instead of reverse order), which fails for
-	# python-central+init.d.
-	dh_installinit --noscripts -ppyro --name=pyro-nsd
-	# some permissions that makes lintian/linda happier
-	find debian/pyro-examples/usr/share/doc/pyro/examples -exec chmod a-x {} \;
-	chmod 755 $(CURDIR)/debian/pyro-gui/`pycentral pycentraldir pyro-gui`/Pyro/wxnsc.py
-	chmod 755 $(CURDIR)/debian/pyro/`pycentral pycentraldir pyro`/Pyro/ext/daemonizer.py
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_pycentral -ppyro -ppyro-gui
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+.PHONY: build clean


