tags 445415 + patch
thanks
Hi,
The following is the diff for my revelation 0.4.11-3.1 NMU.
diff -u revelation-0.4.11/debian/rules revelation-0.4.11/debian/rules
--- revelation-0.4.11/debian/rules
+++ revelation-0.4.11/debian/rules
@@ -17,8 +17,7 @@
PREFIX=/usr
-# force python version to 2.4
-VERSION=2.4
+PYVERS=$(shell pyversions -vs)
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -29,39 +28,42 @@
INSTALL_PROGRAM += -s
endif
-configure: configure-stamp
-configure-stamp:
+build-python%-stamp:
dh_testdir
- PYTHON=/usr/bin/python$(VERSION) ./configure \
- --with-python-include=/usr/include/python$(VERSION) \
+ PYTHON=/usr/bin/python$* ./configure \
+ --with-python-include=/usr/include/python$* \
--prefix=$(PREFIX) --sysconfdir=/etc \
--libexecdir=/usr/share/revelation/libexec \
--disable-mime-update --disable-desktop-update
--disable-schemas-install
- touch configure-stamp
+ $(MAKE) clean
+ $(MAKE)
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/revelation
+
+ touch $@
-build: patch-stamp build-stamp
+build-stamp: patch-stamp
+ dh_testdir
+ dh_clean -k
+ for py in $(PYVERS); do \
+ $(MAKE) -f debian/rules build-python$$py-stamp; \
+ done
+ touch $@
patch-stamp:
dpatch apply-all
touch patch-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- make
-
- touch build-stamp
+build: build-stamp
clean: do-clean unpatch
do-clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
+ rm -f build-stamp build-python*-stamp
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
rm -rf build pixmaps revelation.1
@@ -77,11 +79,8 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/revelation
-
mkdir -p $(CURDIR)/pixmaps
convert $(CURDIR)/data/icons/32x32/revelation.png \
@@ -92,7 +91,9 @@
$(CURDIR)/pixmaps/revelation.xpm \
$(CURDIR)/debian/revelation/$(PREFIX)/share/pixmaps/revelation.xpm
- chmod 755
$(CURDIR)/debian/revelation/$(PREFIX)/lib/python$(VERSION)/site-packages/revelation/bundle/PBKDFv2.py
+ for py in $(PYVERS); do \
+ chmod 755
$(CURDIR)/debian/revelation/$(PREFIX)/lib/python$$py/site-packages/revelation/bundle/PBKDFv2.py;
\
+ done
# Build architecture-independent files here.
binary-indep: build install
@@ -114,7 +115,6 @@
dh_compress
dh_fixperms
dh_pycentral
- dh_python
dh_gconf
dh_desktop
dh_installdeb
diff -u revelation-0.4.11/debian/changelog revelation-0.4.11/debian/changelog
--- revelation-0.4.11/debian/changelog
+++ revelation-0.4.11/debian/changelog
@@ -1,3 +1,11 @@
+revelation (0.4.11-3.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Fix debian/rules and revelation script to not depend on a particular
+ version of Python. (Closes: #445415)
+
+ -- Chris AtLee <[EMAIL PROTECTED]> Wed, 17 Sep 2008 09:04:16 -0400
+
revelation (0.4.11-3) unstable; urgency=low
* Updated to Policy version 3.7.3
diff -u revelation-0.4.11/debian/control revelation-0.4.11/debian/control
--- revelation-0.4.11/debian/control
+++ revelation-0.4.11/debian/control
@@ -2,14 +2,12 @@
Section: gnome
Priority: optional
Maintainer: Stefan Voelkel <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.37.2), xsltproc, docbook-xsl, python,
python2.4-dev (>= 2.3.5-11), imagemagick, python-crypto, python-gtk2-dev,
libglib2.0-dev, pkg-config, gconf2, python-gnome2-dev, libgtk2.0-dev,
libgnomeui-dev, cracklib2-dev, cracklib-runtime, python-gnome2, libbonoboui2-0,
libbonoboui2-dev, libpanel-applet2-dev, python-gnome2-extras-dev,
python-gnome2-desktop-dev, dpatch, python-central (>= 0.5), libxml-parser-perl
+Build-Depends: debhelper (>= 5.0.37.2), xsltproc, docbook-xsl, python-all-dev,
imagemagick, python-crypto, python-gtk2-dev, libglib2.0-dev, pkg-config,
gconf2, python-gnome2-dev, libgtk2.0-dev, libgnomeui-dev, cracklib2-dev,
cracklib-runtime, python-gnome2, libbonoboui2-0, libbonoboui2-dev,
libpanel-applet2-dev, python-gnome2-extras-dev, python-gnome2-desktop-dev,
dpatch, python-central (>= 0.5), libxml-parser-perl
Standards-Version: 3.7.3
-XS-Python-Version: current
Package: revelation
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-gtk2,
python-gnome2, python-crypto, python-xml, gnome-icon-theme, shared-mime-info,
python-gnome2-extras
-XB-Python-Version: ${python:Versions}
Description: GNOME2 Password manager
Revelation is a password manager for the GNOME 2 desktop. It organizes
accounts in a tree structure, and stores them as AES-encrypted XML.
diff -u revelation-0.4.11/debian/patches/00list
revelation-0.4.11/debian/patches/00list
--- revelation-0.4.11/debian/patches/00list
+++ revelation-0.4.11/debian/patches/00list
@@ -3,0 +4 @@
+40_python.dpatch
only in patch2:
unchanged:
--- revelation-0.4.11.orig/debian/patches/40_python.dpatch
+++ revelation-0.4.11/debian/patches/40_python.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_python.dpatch by Chris AtLee <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't need the workaround any more
+
[EMAIL PROTECTED]@
+diff -urNad revelation-0.4.11~/src/revelation.in
revelation-0.4.11/src/revelation.in
+--- revelation-0.4.11~/src/revelation.in 2008-09-17 09:11:24.000000000
-0400
++++ revelation-0.4.11/src/revelation.in 2008-09-17 09:11:52.000000000
-0400
+@@ -1,14 +1,4 @@
+-#!/usr/bin/env python2.4
+-
+-# WORKAROUND [EMAIL PROTECTED]
+-#
+-# as of 20050812 running revelation with python2.3 leads to a unresolved
+-# symbol exception, thus we force python2.4
+-#
+-# still true 20070210
+-#
+-# WORKAROUND
+-
++#!/usr/bin/python
+
+ #
+ # Revelation - a password manager for GNOME 2
+@@ -34,9 +24,6 @@
+
+ import gettext, gnome, gobject, gtk, gtk.gdk, os, pwd, sys
+
+-if "@pyexecdir@" not in sys.path:
+- sys.path.insert(0, "@pyexecdir@")
+-
+ from revelation import config, data, datahandler, dialog, entry, io, ui, util
+
+ _ = gettext.gettext
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
