Bug#589015: ntfs-config and python 2.6

[Jakub Wilk]

* Lorenzo De Liso bla...@ubuntu.com, 2010-07-14, 11:39:

-# Check for python  2.4 and pygtk  2.6
-AM_PATH_PYTHON_VERSION(2.4, 2.4.0, 2.5, 2.5.0)
+# Check for python  2.6 and pygtk  2.6
+AM_PATH_PYTHON_VERSION(2.6, 2.6.0)


Dear Lorenzo, please refuse temptation to hardcode Python versions, 
unless it is really necessary.


Dear maintainer, please use my patch instead, which does the following 
things:
1. Gets rid of XB-Python-Version in the source stanza (it doesn't make sense 
there), and add XS-Python-Version instead.
2. Lets Python dependencies be generated automatically by 
python-support.
3. Forces the configure script to use /usr/bin/python (rather than 
/usr/bin/python2.4 and /usr/bin/python2.5), i.e. always the default 
Python version.


--
Jakub Wilk
diff -Nru ntfs-config-1.0.1/debian/control ntfs-config-1.0.1/debian/control
--- ntfs-config-1.0.1/debian/control	2010-04-09 20:56:31.0 +0200
+++ ntfs-config-1.0.1/debian/control	2010-07-15 17:20:56.0 +0200
@@ -7,12 +7,12 @@
libhal-dev (= 0.5.2), libhal-storage-dev (= 0.5.2),
libxml-parser-perl, autoconf, python-dev
 Standards-Version: 3.8.4
-XB-Python-Version: ${python:Versions}
+XS-Python-Version: = 2.4
 Homepage: http://flomertens.free.fr/ntfs-config/
 
 Package: ntfs-config
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ntfs-3g, python2.5, udev,
+Depends: ${shlibs:Depends}, ${misc:Depends}, ntfs-3g, ${python:Depends}, udev,
  python-glade2
 Suggests: disk-manager
 XB-Python-Version: ${python:Versions}
diff -Nru ntfs-config-1.0.1/debian/rules ntfs-config-1.0.1/debian/rules
--- ntfs-config-1.0.1/debian/rules	2010-03-03 19:29:56.0 +0100
+++ ntfs-config-1.0.1/debian/rules	2010-07-15 17:23:37.0 +0200
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export PYTHON=/usr/bin/python
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk


signature.asc
Description: Digital signature

Bug#589015: ntfs-config and python 2.6

[Lorenzo De Liso]

Package: ntfs-config
Version: 1.0.1-6
Severity: normal
Tags: patch
Justification: Policy 9.3.2
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu maverick ubuntu-patch

Hi, 

In ubuntu we applied the attached patch. We think you need to apply this
patch to the debian package too. Attaching the patch with a modify from
me. 


--- ntfs-config-1.0.1.orig/configure.in  
+++ ntfs-config-1.0.1/configure.in
@@ -35,8 +35,8 @@
 AM_GLIB_GNU_GETTEXT
 AC_PROG_INTLTOOL
 
-# Check for python  2.4 and pygtk  2.6
-AM_PATH_PYTHON_VERSION(2.4, 2.4.0, 2.5, 2.5.0)
+# Check for python  2.6 and pygtk  2.6
+AM_PATH_PYTHON_VERSION(2.6, 2.6.0)
 AC_DEFUN([required_pygtk_version], [2.6.0])
 AC_SUBST([PYOPTIONS], [-OOt])
 AC_MSG_CHECKING(for pygtk = required_pygtk_version installed)

--- ntfs-config-1.0.1/debian/control	2010-04-09 20:56:31.0 +0200
+++ ntfs-config-1.0.1/debian/control	2010-07-14 01:11:56.0 +0200
@@ -12,7 +13,7 @@
 Package: ntfs-config
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ntfs-3g, python2.5, udev,
+Depends: ${shlibs:Depends}, ${misc:Depends}, ntfs-3g, ${python:Depends}, udev,
  python-glade2
 Suggests: disk-manager
 XB-Python-Version: ${python:Versions}