Your message dated Sun, 27 Jun 2010 21:37:31 +0000
with message-id <[email protected]>
and subject line Bug#587334: fixed in disk-manager 1.0.1-5
has caused the Debian Bug report #587334,
regarding disk-manager: Depends on python2.5 unnecessarily
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
587334: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=587334
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: disk-manager
Version: 1.0.1-4.2
Severity: important
Tags: patch
User: [email protected]
Usertag: python2.6
Hi, disk-manager provides python scripts have python2.5 shebangs,
causing a dependency on it.
Here is a minimal patch to addresses the issue.
While I was here, I couldn't help noticing that it install modules in
the public python namespace, but no other package needs them.
They can be installed in /usr/share/disk-manager instead.
The second patch addresses that too, if you are interested.
SR
--
Stefano Rivera
http://tumbleweed.org.za/
H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
diff -u disk-manager-1.0.1/debian/rules disk-manager-1.0.1/debian/rules
--- disk-manager-1.0.1/debian/rules
+++ disk-manager-1.0.1/debian/rules
@@ -8,7 +8,9 @@
build: build-stamp
build-stamp: $(QUILT_STAMPFN)
- dh build
+ dh build --before dh_auto_configure
+ PYTHON=/usr/bin/python dh_auto_configure
+ dh build --after dh_auto_configure
touch $@
clean: unpatch
diff -u disk-manager-1.0.1/debian/control disk-manager-1.0.1/debian/control
--- disk-manager-1.0.1/debian/control
+++ disk-manager-1.0.1/debian/control
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: David Paleino <[email protected]>
-Build-Depends: debhelper (>= 7), quilt
+Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~)
Build-Depends-Indep: autotools-dev, python-support (>= 0.5.3),
libxml-parser-perl, python-gtk2
Standards-Version: 3.8.1
diff -u disk-manager-1.0.1/debian/rules disk-manager-1.0.1/debian/rules
--- disk-manager-1.0.1/debian/rules
+++ disk-manager-1.0.1/debian/rules
@@ -3,28 +3,17 @@
-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
+PYDIR=/usr/share/disk-manager
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
- dh build
- touch $@
+%:
+ dh $@ --with quilt
-clean: unpatch
- dh $@
+override_dh_auto_configure:
+ PYTHON=/usr/bin/python dh_auto_configure
-install: install-stamp
-install-stamp: build
- dh install --until dh_auto_install
+override_dh_auto_install:
+ dh_auto_install -- pyexecdir=$(PYDIR)
find $(CURDIR)/debian/disk-manager -name "*.pyc" -or -name "*.pyo" | xargs rm
- dh install --after dh_auto_install
- touch $@
-
-binary-arch:
-
-binary-indep: build install
- dh $@
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_pysupport:
+ dh_pysupport $(PYDIR)
diff -u disk-manager-1.0.1/debian/patches/series disk-manager-1.0.1/debian/patches/series
--- disk-manager-1.0.1/debian/patches/series
+++ disk-manager-1.0.1/debian/patches/series
@@ -5,0 +6 @@
+06-private-pythonlib.patch
only in patch2:
unchanged:
--- disk-manager-1.0.1.orig/debian/patches/06-private-pythonlib.patch
+++ disk-manager-1.0.1/debian/patches/06-private-pythonlib.patch
@@ -0,0 +1,40 @@
+Description: We use a private Python module directory, patch it into sys.path
+ at the start of the binaries.
+Author: Stefano Rivera <[email protected]>
+Last-Update: 2010-06-27
+--- a/disk-manager-root.in
++++ b/disk-manager-root.in
+@@ -26,15 +26,7 @@
+ import gettext
+ from subprocess import *
+
+-# Hack to make sure that path is set correctly when installation is in /usr/local
+-if "/usr/local" in sys.argv[0] :
+- for path in sys.path :
+- if "/usr/lib/python" in path :
+- local_path = path.replace("/usr", "/usr/local")
+- if not local_path in sys.path :
+- sys.path.append(path.replace("/usr", "/usr/local"))
+- if not "/usr/local/bin" in os.environ["PATH"] :
+- os.environ["PATH"] += ":/usr/local/bin"
++sys.path.insert(0, '/usr/share/disk-manager')
+
+ from DiskManager.Fstab.FstabDialogs import dialog
+ from DiskManager.config import *
+--- a/disk-manager.in
++++ b/disk-manager.in
+@@ -29,13 +29,7 @@
+
+ import gtk
+
+-# Hack to make sure that path is set correctly when installation is in /usr/local
+-if "/usr/local" in sys.argv[0] :
+- for path in sys.path :
+- if "/usr/lib/python" in path :
+- local_path = path.replace("/usr", "/usr/local")
+- if not local_path in sys.path :
+- sys.path.append(path.replace("/usr", "/usr/local"))
++sys.path.insert(0, '/usr/share/disk-manager')
+
+ from DiskManager.DiskManager import *
+ from DiskManager.Config import Config
signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
Source: disk-manager
Source-Version: 1.0.1-5
We believe that the bug you reported is fixed in the latest version of
disk-manager, which is due to be installed in the Debian FTP archive:
disk-manager_1.0.1-5.debian.tar.gz
to main/d/disk-manager/disk-manager_1.0.1-5.debian.tar.gz
disk-manager_1.0.1-5.dsc
to main/d/disk-manager/disk-manager_1.0.1-5.dsc
disk-manager_1.0.1-5_all.deb
to main/d/disk-manager/disk-manager_1.0.1-5_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
David Paleino <[email protected]> (supplier of updated disk-manager package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sun, 27 Jun 2010 22:27:44 +0200
Source: disk-manager
Binary: disk-manager
Architecture: source all
Version: 1.0.1-5
Distribution: unstable
Urgency: low
Maintainer: David Paleino <[email protected]>
Changed-By: David Paleino <[email protected]>
Description:
disk-manager - simple graphical filesystem configurator
Closes: 587334
Changes:
disk-manager (1.0.1-5) unstable; urgency=low
.
* debian/copyright updated:
- missing po/*.po copyrights
- debian/disk-manager.xpm copyright specified
- don't refer to symlink licenses
* debian/control:
- email address updated
- DMUA removed
- removed build-dependency on quilt
- bumped build-dependency on debhelper to >= 7.0.50~
- bumped build-dependency on python-support to >= 0.90.0~
- bumped Standards-Version to 3.8.4, no changes needed
* debian/source/format: use 3.0 (quilt)
* debian/pyversions added, instead of {XS,XB}-Python-Version in
debian/control
* debian/rules:
- remove quilt machinery
- rewritten using more compact dh7
- support private module location
- pass a generic "python" script for shebangs to configure script,
thanks to Stefano Rivera (Closes: #587334)
* debian/patches/:
- *.patch refreshed, added DEP-3 headers
- 06-private_pythonlib.patch added, thanks to Stefano Rivera.
- 07-fix_manpage_typos.patch added, fixes some typos found by lintian.
Checksums-Sha1:
1f16b9d2e81d5463e21cc3b7ae237392a5f6b4cd 1288 disk-manager_1.0.1-5.dsc
e840da70865ba2c27374b91b3322f87d3f530d6e 6356
disk-manager_1.0.1-5.debian.tar.gz
49af274cd5cc967397dec6498b0e81a0b4708752 127790 disk-manager_1.0.1-5_all.deb
Checksums-Sha256:
6b6471c9dec3ebc339e564e0e4e1f45e67d37e5a0a51e11b2dca1d14c92efec0 1288
disk-manager_1.0.1-5.dsc
98803ad7e252fc8339cefcf31250253730b878a80dd94aa35ac0d5ad62dd3300 6356
disk-manager_1.0.1-5.debian.tar.gz
54f472c1d4c26285468fe5583320c088525d2857270e0dc9f583a1486998b4e6 127790
disk-manager_1.0.1-5_all.deb
Files:
d3efdc8ee811ac5212bf1322336bfd2e 1288 admin optional disk-manager_1.0.1-5.dsc
2604f1414ea9abb834832b169f828b67 6356 admin optional
disk-manager_1.0.1-5.debian.tar.gz
fe66edaeddb3dc6746e5de5eac0ee782 127790 admin optional
disk-manager_1.0.1-5_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAkwntbsACgkQ5qqQFxOSsXTouwCgxeFR+xLvJdAfVy9AC5W31ZLc
vWoAnjumFx/VP1O7p0jd4TJhpUUtEdud
=qqQ2
-----END PGP SIGNATURE-----
--- End Message ---
