Hi, Attached is the diff for my python-osd 0.2.12-1.1 NMU.
this went through a major rewrite of the debian/rules using very standard debhelper tools -- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
reverted:
--- python-osd-0.2.12/debian/README.Debian.dummy
+++ python-osd-0.2.12.orig/debian/README.Debian.dummy
@@ -1,4 +0,0 @@
-This is a dummy package that only depends on the version of
-python-osd matching the current default Python package in
-Debian. That is, while the Debian package 'python' depends
-on pythonX.Y, this package will depend on pythonX.Y-osd.
diff -u python-osd-0.2.12/debian/changelog python-osd-0.2.12/debian/changelog
--- python-osd-0.2.12/debian/changelog
+++ python-osd-0.2.12/debian/changelog
@@ -1,3 +1,11 @@
+python-osd (0.2.12-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update package to the new python policy (Closes: #373332).
+ * Add missing depends on python-twisted (Closes: #320167).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Fri, 30 Jun 2006 01:45:42 +0200
+
python-osd (0.2.12-1) unstable; urgency=low
* New upstream release. Closes: #290724.
diff -u python-osd-0.2.12/debian/rules python-osd-0.2.12/debian/rules
--- python-osd-0.2.12/debian/rules
+++ python-osd-0.2.12/debian/rules
@@ -3,101 +3,59 @@
-PYTHON_VERSIONS=2.3 2.4
+export DH_COMPAT=5
-build: $(foreach p,$(PYTHON_VERSIONS),build-python-$(p))
-install: $(foreach p,$(PYTHON_VERSIONS),install-python-$(p))
-binary: binary-indep binary-arch
-binary-indep: binary-indep-dummy
-binary-arch: $(foreach p,$(PYTHON_VERSIONS),binary-arch-python-$(p))
+PYVERS=$(shell pyversions -r)
+build: build-stamp
+build-stamp:
+ dh_testdir
+ set -e; \
+ for python in $(PYVERS); do \
+ $$python setup.py build; \
+ done
+ touch $@
clean:
- test -e debian/control
- test root = "`whoami`" || (echo need root priviledges; exit 1)
- rm -rf build debian/install
- find . -type f -name '*.pyc' -print0 \
- | xargs -0 --no-run-if-empty rm --
- rm -rf debian/substvars debian/files
- chmod -R g-s .
-
-
-DUMMY_INSTDIR:=debian/install/dummy
-DUMMY_DOCDIR:=$(DUMMY_INSTDIR)/usr/share/doc/python-osd
-binary-indep-dummy:
- test -e debian/control
- test root = "`whoami`" || (echo need root priviledges; exit 1)
-
- install -d --mode=0755 \
- '$(DUMMY_INSTDIR)/DEBIAN' \
- '$(DUMMY_DOCDIR)'
- install --mode=0644 \
- debian/copyright \
- '$(DUMMY_DOCDIR)'
- install --mode=0644 \
- debian/changelog \
- '$(DUMMY_DOCDIR)/changelog.Debian'
- install --mode=0644 \
- debian/README.Debian.dummy \
- '$(DUMMY_DOCDIR)/README.Debian'
- gzip -9f \
- '$(DUMMY_DOCDIR)/README.Debian' \
- '$(DUMMY_DOCDIR)/changelog.Debian'
- dpkg-gencontrol -isp -p'python-osd' -P'$(DUMMY_INSTDIR)'
- dpkg --build '$(DUMMY_INSTDIR)' ..
-
-
-build-python-%:
- test -e debian/control
- /usr/bin/python$* setup.py build
-
-
-install-python-%: build-python-%
- test -e debian/control
- test root = "`whoami`" || (echo need root priviledges; exit 1)
- rm -rf debian/substvars
- install -d -m0755 'debian/install/$*'
- /usr/bin/python$* setup.py install --root='debian/install/$*'
- find 'debian/install/$*/usr/lib' -name '*.so' -print0 \
- | xargs -0 --no-run-if-empty \
- strip --remove-section=.comment \
- --remove-section=.note --strip-unneeded
- chmod -R go-w 'debian/install/$*'
-
- install -d --mode=0755 '$(call docdir,$*)'
- install --mode=0644 \
- AUTHORS \
- README \
- README.daemon \
- pyosd.html \
- debian/copyright \
- '$(call docdir,$*)'
- install --mode=0644 \
- ChangeLog \
- '$(call docdir,$*)/changelog'
- install --mode=0644 \
- ChangeLog.old \
- '$(call docdir,$*)/changelog.old'
- install --mode=0644 \
- debian/changelog \
- '$(call docdir,$*)/changelog.Debian'
- gzip -9f \
- '$(call docdir,$*)/README' \
- '$(call docdir,$*)/changelog' \
- '$(call docdir,$*)/changelog.Debian'
- install -d -m0755 '$(call docdir,$*)/examples/modules'
- find modules -type f -print0 -exec \
- install -D -m0644 '{}' '$(call docdir,$*)/examples/{}' \;
-
-
-docdir=debian/install/$(1)/usr/share/doc/python$(1)-osd
-
-binary-arch-python-%: install-python-%
- test -e debian/control
- test root = "`whoami`" || (echo need root priviledges; exit 1)
-
- install -d --mode=0755 'debian/install/$*/DEBIAN'
- dpkg-shlibdeps `find 'debian/install/$*/usr/lib' -name '*.so'`
- dpkg-gencontrol -isp -p'python$*-osd' -P'debian/install/$*'
- dpkg --build 'debian/install/$*' ..
-
-.PHONY: build clean binary-indep binary-arch binary \
- binary-indep-dummy \
- binary-arch-python-% install-python-% build-python-%
+ dh_testdir
+ for python in $(PYVERS); do \
+ $$python setup.py clean; \
+ done
+ rm -rf build-stamp build
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ set -e; \
+ for python in $(PYVERS); do \
+ $$python setup.py install --root=debian/tmp; \
+ done
+
+binary-indep: build install
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_install --list-missing
+
+ dh_installdocs
+ dh_installexamples
+
+ dh_installchangelogs
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+ dh_pysupport
+ dh_python
+# dh_perl
+ dh_shlibdeps -l`pwd`/debian/tmp/usr/lib/
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff -u python-osd-0.2.12/debian/control python-osd-0.2.12/debian/control
--- python-osd-0.2.12/debian/control
+++ python-osd-0.2.12/debian/control
@@ -5,40 +5,16 @@
-Standards-Version: 3.6.1
-Build-Depends: python2.3-dev, python2.4-dev, libxosd-dev (>= 2.2.6)
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11),
+ libxosd-dev (>= 2.2.6), python-support (>= 0.3)
Package: python-osd
-Architecture: all
-Depends: python (>= 2.3), python (<< 2.4), python2.3-osd
-Description: Python bindings for X On-Screen Display library
- PyOSD is a python module for displaying text on your X display, much
- like the "On Screen Displays" used on TVs and some monitors.
- .
- It can be used by anything that needs your attention, such as showing
- the song currently playing in a Python-based MP3 player.
- .
- This is a dummy package that depends on the correct version of
- python-osd for the default version of Python.
-
-Package: python2.3-osd
-Architecture: any
-Depends: python2.3, ${shlibs:Depends}
-Recommends: python2.3-twisted
-Description: Python bindings for X On-Screen Display library
- PyOSD is a python module for displaying text on your X display, much
- like the "On Screen Displays" used on TVs and some monitors.
- .
- It can be used by anything that needs your attention, such as showing
- the song currently playing in a Python-based MP3 player.
- .
- This version is usable with python2.3
-
-Package: python2.4-osd
Architecture: any
-Depends: python2.4, ${shlibs:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, python-twisted
+Provides: ${python:Provides}
+Replaces: python2.3-osd (<< 0.2.12-1.1), python2.4-osd (<< 0.2.12-1.1)
+Conflicts: python2.3-osd (<< 0.2.12-1.1), python2.4-osd (<< 0.2.12-1.1)
Description: Python bindings for X On-Screen Display library
PyOSD is a python module for displaying text on your X display, much
like the "On Screen Displays" used on TVs and some monitors.
.
It can be used by anything that needs your attention, such as showing
the song currently playing in a Python-based MP3 player.
- .
- This version is usable with python2.4
only in patch2:
unchanged:
--- python-osd-0.2.12.orig/debian/pycompat
+++ python-osd-0.2.12/debian/pycompat
@@ -0,0 +1 @@
+2
only in patch2:
unchanged:
--- python-osd-0.2.12.orig/debian/install
+++ python-osd-0.2.12/debian/install
@@ -0,0 +1 @@
+debian/tmp/*
signature.asc
Description: Digital signature
