Bug#377325: [patch] Support updated Python policy

2006-07-11 Thread John Lightsey
On Sat, 2006-07-08 at 12:52 +0200, Matthias Klose wrote:
 Package: castle-combat
 Tags: patch
 
 I'm not uploading this before Jul 15 as a NMU, because it's a change
 to the build system as well (introducing debhelper).

While I certainly appreciate the help in updating to the new Python
policy, I don't understand why switching to debhelper would be the
preferred way of doing so.  The Debian Python Policy states that
python-central can be used without debhelper, though it doesn't provide
detailed guidance on how this is done.  All three of the examples
referenced in the policy guide use debhelper.

Do you know where I could find an example of the new python policy
implemented without debhelper?

Thanks for your help

John



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#377325: [patch] Support updated Python policy

2006-07-11 Thread Matthias Klose
John Lightsey writes:
 On Sat, 2006-07-08 at 12:52 +0200, Matthias Klose wrote:
  Package: castle-combat
  Tags: patch
  
  I'm not uploading this before Jul 15 as a NMU, because it's a change
  to the build system as well (introducing debhelper).
 
 While I certainly appreciate the help in updating to the new Python
 policy, I don't understand why switching to debhelper would be the
 preferred way of doing so.  The Debian Python Policy states that
 python-central can be used without debhelper, though it doesn't provide
 detailed guidance on how this is done.  All three of the examples
 referenced in the policy guide use debhelper.
 
 Do you know where I could find an example of the new python policy
 implemented without debhelper?

no. sorry. you surely can add the pycentral calls in postinst/prerm
yourself, and add the substitution variables python:Depends,
python:Provides and python:Versions yourself. Moving the files around
can be done by calling 'pycentral debhelper' manually.

  Matthias


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#377325: [patch] Support updated Python policy

2006-07-08 Thread Matthias Klose
Package: castle-combat
Tags: patch

I'm not uploading this before Jul 15 as a NMU, because it's a change
to the build system as well (introducing debhelper).

  Matthias


diff -u castle-combat-0.8.1/debian/control castle-combat-0.8.1/debian/control
--- castle-combat-0.8.1/debian/control
+++ castle-combat-0.8.1/debian/control
@@ -2,15 +2,17 @@
 Section: games
 Priority: optional
 Maintainer: John Lightsey [EMAIL PROTECTED]
-Build-Depends: dpatch
+Build-Depends: dpatch, debhelper (= 5.0.37.2), python-central (= 0.5)
+XS-Python-Version: = 2.3
 Standards-Version: 3.7.2.0
 
 Package: castle-combat
 Architecture: all
-Depends: python (= 2.3), python-twisted, python-pygame, ttf-bitstream-vera
+Depends: ${python:Depends}, python-twisted, python-pygame, ttf-bitstream-vera
 Provides: castle-combat-data
 Replaces: castle-combat-data ( 0.8.0)
 Conflicts: castle-combat-data ( 0.8.0)
+XB-Python-Version: ${python:Versions}
 Description: game where the player builds one castle and destroys others
  A clone of the old DOS game Rampart. Up to four players (or
  more in future versions) build castle walls, place cannons
reverted:
--- castle-combat-0.8.1/debian/postinst
+++ castle-combat-0.8.1.orig/debian/postinst
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-
-if [ $1 = configure ]  [ -x /usr/bin/update-menus ]; then
-   update-menus
-   PYTHON=python2.3
-   if which $PYTHON /dev/null 21; then
-   DIRLIST=/usr/share/games/castle-combat
-   for i in $DIRLIST ; do
-#  $PYTHON -E -O /usr/lib/$PYTHON/compileall.py -q $i
-   $PYTHON -E /usr/lib/$PYTHON/compileall.py -q $i
-   done
-   fi
-fi
reverted:
--- castle-combat-0.8.1/debian/postrm
+++ castle-combat-0.8.1.orig/debian/postrm
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-if [ -x `which update-menus 2/dev/null` ]; then update-menus ; fi
reverted:
--- castle-combat-0.8.1/debian/prerm
+++ castle-combat-0.8.1.orig/debian/prerm
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-dpkg -L castle-combat | awk '$0~/\.py$/ {print $0c\n $0o}' | \
-   xargs rm -f 2
diff -u castle-combat-0.8.1/debian/rules castle-combat-0.8.1/debian/rules
--- castle-combat-0.8.1/debian/rules
+++ castle-combat-0.8.1/debian/rules
@@ -57,6 +57,7 @@
rm -f build-stamp configure-stamp debian/files
rm -f debian/castle-combat.substvars
rm -rf debian/castle-combat
+   dh_clean
 
 install: build checkroot
rm -f debian/castle-combat.substvars
@@ -87,26 +88,19 @@
 
 # Build architecture-dependent files here.
 binary-indep: build install checkroot
-   $(INSTALL_DIR) debian/castle-combat/usr/share/doc/castle-combat \
-  debian/castle-combat/usr/share/menu \
-  debian/castle-combat/DEBIAN
-   $(INSTALL_FILE) README TODO debian/copyright 
debian/castle-combat/usr/share/doc/castle-combat
-   $(INSTALL_FILE) debian/menu 
debian/castle-combat/usr/share/menu/castle-combat
-   $(INSTALL_FILE) debian/changelog 
debian/castle-combat/usr/share/doc/castle-combat/changelog.Debian
-   
-   chmod a-x debian/castle-combat/usr/share/man/man6/castle-combat.6
-   gzip -9f debian/castle-combat/usr/share/man/man6/castle-combat.6 \
- 
debian/castle-combat/usr/share/doc/castle-combat/changelog.Debian
-   $(INSTALL_SCRIPT) debian/postinst debian/postrm debian/prerm 
debian/castle-combat/DEBIAN
-   dpkg-gencontrol -pcastle-combat -ldebian/changelog -isp \
- -Pdebian/castle-combat
-   chmod 644 debian/castle-combat/DEBIAN/control
-   chown 0.0 debian/castle-combat/DEBIAN/control
-   cd debian/castle-combat  find . -type f  ! -regex '.*/DEBIAN/.*' 
-printf '%P\0' \
- | xargs -r0 md5sum  DEBIAN/md5sums
-   chmod 644 debian/castle-combat/DEBIAN/md5sums
-   chown 0.0 debian/castle-combat/DEBIAN/md5sums
-   dpkg-deb --build debian/castle-combat ..
+   dh_testdir
+   dh_testroot
+   dh_installdocs -i README TODO
+   dh_installchangelogs -i
+   dh_installmenu -i
+   dh_pycentral -i
+   dh_python -i #/usr/share/games/castle-combat
+   dh_compress -i
+   dh_fixperms -i
+   dh_installdeb -i
+   dh_gencontrol -i
+   dh_md5sums -i
+   dh_builddeb -i
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
diff -u castle-combat-0.8.1/debian/changelog 
castle-combat-0.8.1/debian/changelog
--- castle-combat-0.8.1/debian/changelog
+++ castle-combat-0.8.1/debian/changelog
@@ -1,3 +1,9 @@
+castle-combat (0.8.1-1.1) unstable; urgency=low
+
+  * Convert to updated Python policy.
+
+ -- Matthias Klose [EMAIL PROTECTED]  Sat,  8 Jul 2006 10:46:49 +
+
 castle-combat (0.8.1-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- castle-combat-0.8.1.orig/debian/substvars
+++ castle-combat-0.8.1/debian/substvars
@@ -0,0 +1 @@
+python:Versions== 2.3
only in patch2:
unchanged:
---