Hi, Attached is the diff for my pymol 0.98+0.99rc6-1.1 NMU.
-- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
diff -u pymol-0.98+0.99rc6/debian/patches/00list
pymol-0.98+0.99rc6/debian/patches/00list
--- pymol-0.98+0.99rc6/debian/patches/00list
+++ pymol-0.98+0.99rc6/debian/patches/00list
@@ -6,0 +7 @@
+11_fix__cmd_import.dpatch
diff -u pymol-0.98+0.99rc6/debian/control pymol-0.98+0.99rc6/debian/control
--- pymol-0.98+0.99rc6/debian/control
+++ pymol-0.98+0.99rc6/debian/control
@@ -2,8 +2,8 @@
Section: science
Priority: optional
Maintainer: Michael Banck <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), dpatch, python, python-dev,
python-numeric, glutg3-dev, libpng12-0-dev, tk8.4-dev, libfreetype6-dev
-Standards-Version: 3.5.6.1
+Build-Depends: debhelper (>= 4.0.0), dpatch, python-dev, python-numeric,
glutg3-dev, libpng12-0-dev, tk8.4-dev, libfreetype6-dev, python-support (>= 0.4)
+Standards-Version: 3.7.2
Package: pymol
Architecture: any
diff -u pymol-0.98+0.99rc6/debian/changelog pymol-0.98+0.99rc6/debian/changelog
--- pymol-0.98+0.99rc6/debian/changelog
+++ pymol-0.98+0.99rc6/debian/changelog
@@ -1,3 +1,17 @@
+pymol (0.98+0.99rc6-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update packate to the last python policy (Closes: 380910):
+ + use dh_pysupport.
+ + add 11_fix__cmd_import.dpatch to fix an import that does not behaves
+ well.
+ + adapt the wrapper to the new path's.
+ * Bump Standards-Version to 3.7.2.
+ * Bump DH_COMPAT to 4.
+ * Fix more files that have wrong executable bits set.
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Wed, 30 Aug 2006 11:09:00 +0200
+
pymol (0.98+0.99rc6-1) unstable; urgency=low
* New upstream release candidate.
diff -u pymol-0.98+0.99rc6/debian/rules pymol-0.98+0.99rc6/debian/rules
--- pymol-0.98+0.99rc6/debian/rules
+++ pymol-0.98+0.99rc6/debian/rules
@@ -1,12 +1,12 @@
#!/usr/bin/make -f
# -*- Makefile -*-
-export DH_COMPAT=3
+export DH_COMPAT=4
DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
export PYMOL_PATH=$(CURDIR)
-PYTHON_VERSION := `python -V 2>&1 | sed -e s/^Python\ // -e s/\.[0-9]$$//`
+PYTHON_VERSION := $(shell pyversions -dv)
include /usr/share/dpatch/dpatch.make
@@ -75,12 +75,13 @@
dh_installmenu
dh_installmime
dh_installexamples
- chmod -x $(BUILD_DIR)/usr/share/doc/pymol/examples/1tii.pdb
+ chmod -x $(BUILD_DIR)/usr/share/doc/pymol/examples/*.pdb
+ chmod -x $(BUILD_DIR)/usr/share/pymol/cmyk.png
dh_installdocs -A DEVELOPERS README
dh_installchangelogs CHANGES
# dh_undocumented pymol.1
dh_link
- dh_python
+ dh_pysupport
dh_strip
dh_compress -Xpdb
dh_fixperms
diff -u pymol-0.98+0.99rc6/debian/pymol.launch.in
pymol-0.98+0.99rc6/debian/pymol.launch.in
--- pymol-0.98+0.99rc6/debian/pymol.launch.in
+++ pymol-0.98+0.99rc6/debian/pymol.launch.in
@@ -5,4 +5,4 @@
-export PYMOL_PATH=/usr/lib/[EMAIL PROTECTED]@/site-packages/pymol/
+export PYMOL_PATH=/var/lib/python-support/[EMAIL PROTECTED]@/pymol/
export CHEMPY_DATA=/usr/share/chempy
[EMAIL PROTECTED]@ /usr/lib/[EMAIL PROTECTED]@/site-packages/pymol/__init__.py
$*
[EMAIL PROTECTED]@ ${PYMOL_PATH}/__init__.py "$*"
only in patch2:
unchanged:
--- pymol-0.98+0.99rc6.orig/debian/patches/11_fix__cmd_import.dpatch
+++ pymol-0.98+0.99rc6/debian/patches/11_fix__cmd_import.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_fix__cmd_import.dpatch by Pierre Habouzit <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad pymol-0.98+0.99rc6~/modules/pymol/__init__.py
pymol-0.98+0.99rc6/modules/pymol/__init__.py
+--- pymol-0.98+0.99rc6~/modules/pymol/__init__.py 2006-08-30
11:44:52.000000000 +0200
++++ pymol-0.98+0.99rc6/modules/pymol/__init__.py 2006-08-30
11:48:51.000000000 +0200
+@@ -350,7 +350,7 @@
+ _cmd.runpymol(block_input_hook) # only returns if we are running
pretend GLUT
+ # from pymol.embed import wxpymol # never returns
+
+- import _cmd
++ from pymol import _cmd
+ import cmd
+
+ def thread_launch(pa):
signature.asc
Description: Digital signature
