[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Migrating unmanaged Python library extension from ‘python-central’ to ‘python-support’



[Piotr Ożarowski, 2009-04-15]
> [Ben Finney, 2009-04-15]
> > > Just fill in .install file, and then call `dh_install; dh_pysupport`
> > > in debian/rules
> > 
> > As I said in the original message, I'd love to just do that; but it
> > doesn't work, as explained in the material you quoted above.
> 
> otherwise I don't know why you can't just use:

oh, you can't - dh_pysupport doesn't pick up files from /usr/share/pyshared
(Joss: could you add this path to movemodules?)

I'm attaching patch that also uses dh_install to install files (and installs to
/usr/share/python-support/docutils-writer-manpage/docutils/writers/
for now)
diff -u docutils-writer-manpage-0.1~svn.r5663/debian/changelog docutils-writer-manpage-0.1~svn.r5663/debian/changelog
--- docutils-writer-manpage-0.1~svn.r5663/debian/changelog
+++ docutils-writer-manpage-0.1~svn.r5663/debian/changelog
@@ -1,3 +1,10 @@
+docutils-writer-manpage (0.1~svn.r5663-4) UNRELEASED; urgency=low
+
+  * Switch from python-central to python-support
+  * Use dh_install to install files (instead of install call in debian/rules)
+
+ -- Piotr Ożarowski  <piotr@debian.org>  Wed, 15 Apr 2009 13:19:37 +0200
+
 docutils-writer-manpage (0.1~svn.r5663-3) unstable; urgency=low
 
   * debian/rules:
diff -u docutils-writer-manpage-0.1~svn.r5663/debian/rules docutils-writer-manpage-0.1~svn.r5663/debian/rules
--- docutils-writer-manpage-0.1~svn.r5663/debian/rules
+++ docutils-writer-manpage-0.1~svn.r5663/debian/rules
@@ -12,11 +12,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-WRITER_PACKAGE = docutils-writer-manpage
-PROGRAM_PACKAGE = rst2man
-PROGRAM_DIR = usr/bin
-MANPAGE_WRITER_DIR = usr/share/pyshared/docutils/writers
-
 RST_SUFFIX = .txt
 MANPAGES = rst2man.1
 
@@ -51,15 +46,11 @@
 
 .PHONY: install
 install: build
-	install -d ${MANPAGE_WRITER_DIR}
-	install -m 644 writers/manpage.py ${MANPAGE_WRITER_DIR}
-	install -d ${PROGRAM_DIR}
-	install -m 755 rst2man ${PROGRAM_DIR}
-	dh --with python_central install
+	dh install
 
 .PHONY: binary-indep
 binary-indep: build install
-	dh --with python_central binary-indep
+	dh binary-indep
 
 .PHONY: binary-arch
 binary-arch: build install
diff -u docutils-writer-manpage-0.1~svn.r5663/debian/control docutils-writer-manpage-0.1~svn.r5663/debian/control
--- docutils-writer-manpage-0.1~svn.r5663/debian/control
+++ docutils-writer-manpage-0.1~svn.r5663/debian/control
@@ -5,7 +5,7 @@
 Homepage: http://docutils.sourceforge.net/sandbox/manpage-writer/
 VCS-bzr: http://bzr.debian.org/collab-maint/docutils-writer-manpage/
 Build-Depends: debhelper (>= 7.0.14),
-    python-central (>= 0.6.8),
+    python-support (>= 0.7.2),
     python-docutils
 Standards-Version: 3.8.0
 XS-Python-Version: all
diff -u docutils-writer-manpage-0.1~svn.r5663/debian/docutils-writer-manpage.install docutils-writer-manpage-0.1~svn.r5663/debian/docutils-writer-manpage.install
--- docutils-writer-manpage-0.1~svn.r5663/debian/docutils-writer-manpage.install
+++ docutils-writer-manpage-0.1~svn.r5663/debian/docutils-writer-manpage.install
@@ -1 +1 @@
-usr/share/pyshared/docutils/writers/
+writers/manpage.py /usr/share/python-support/docutils-writer-manpage/docutils/writers/
diff -u docutils-writer-manpage-0.1~svn.r5663/debian/rst2man.install docutils-writer-manpage-0.1~svn.r5663/debian/rst2man.install
--- docutils-writer-manpage-0.1~svn.r5663/debian/rst2man.install
+++ docutils-writer-manpage-0.1~svn.r5663/debian/rst2man.install
@@ -1 +1 @@
-usr/bin/rst2man
+rst2man /usr/bin
only in patch2:
unchanged:
--- docutils-writer-manpage-0.1~svn.r5663.orig/debian/preinst
+++ docutils-writer-manpage-0.1~svn.r5663/debian/preinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+# TODO: remove this file after releasing Squeeze
+set -e
+if [ "$1" = upgrade ]
+then
+	if dpkg --compare-versions "$2" lt 0.1~svn.r5663-4; then
+		pycentral pkgremove docutils-writer-manpage
+	fi
+fi
+
+#DEBHELPER#

Reply to: