the patch attached removes every reference to PYTHONPATH from the build system.
as the paths used for the debian installation are the standard ones, PYTHONPATH is not required at all. everything still seems to work; i couldn't test the cronjob-to-X feature, though, as it didn't work before my patch either. (which is another bug i'll file later.) references to PYTHONPATH are removed from autotools-generated tools as well, as i'm not sure which are rebuilt at build-time. in order for everything to build reproducibly, i had to fix the 03_distclean patch not to produce trailing backslashes. the issue was rather difficult to reproduce, as timestamps of autotools-files are relevant here. i don't feel confident enough with this solution to propose an NMU, but could build one if someone else reviewed the patch. regards chrysn -- To use raw power is to make yourself infinitely vulnerable to greater powers. -- Bene Gesserit axiom
diff --git a/debian/patches/00list b/debian/patches/00list
index 0b6b7b8..a143a16 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
03_distclean
xwrapper_bug567406
+bug605167_hackish
diff --git a/debian/patches/03_distclean.dpatch b/debian/patches/03_distclean.dpatch
index 4d9aa21..61512e3 100644
--- a/debian/patches/03_distclean.dpatch
+++ b/debian/patches/03_distclean.dpatch
@@ -11,8 +11,9 @@ diff -urNad gnome-schedule-2.0.2~/Makefile.am gnome-schedule-2.0.2/Makefile.am
@@ -11,7 +11,6 @@
intltool-merge \
intltool-update \
- po/.intltool-merge-cache \
+- po/.intltool-merge-cache \
- gnome-doc-utils.make
++ po/.intltool-merge-cache
EXTRA_DIST = \
gnome-doc-utils.make \
@@ -22,8 +23,9 @@ diff -urNad gnome-schedule-2.0.2~/Makefile.in gnome-schedule-2.0.2/Makefile.in
@@ -239,7 +239,6 @@
intltool-merge \
intltool-update \
- po/.intltool-merge-cache \
+- po/.intltool-merge-cache \
- gnome-doc-utils.make
++ po/.intltool-merge-cache
EXTRA_DIST = \
gnome-doc-utils.make \
diff --git a/debian/patches/bug605167_hackish.dpatch b/debian/patches/bug605167_hackish.dpatch
new file mode 100644
index 0000000..bae6d8c
--- /dev/null
+++ b/debian/patches/bug605167_hackish.dpatch
@@ -0,0 +1,189 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bug605167_hackish.dpatch by chrysn <chr...@fsfe.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch for debian bug #605167.
+
+...@dpatch@
+diff --git a/Makefile.in b/Makefile.in
+index bec8872..6787dfc 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -178,7 +178,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ PYGTK_CFLAGS = @PYGTK_CFLAGS@
+ PYGTK_LIBS = @PYGTK_LIBS@
+ PYTHON = @PYTHON@
+-PYTHONPATH = @PYTHONPATH@
+ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+ PYTHON_PLATFORM = @PYTHON_PLATFORM@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+diff --git a/configure b/configure
+index 1ea36e9..a736609 100755
+--- a/configure
++++ b/configure
+@@ -671,7 +671,6 @@ AT_CONFIG
+ CRONTAB_CONFIG
+ GNOMEPYTHON_LIBS
+ GNOMEPYTHON_CFLAGS
+-PYTHONPATH
+ PKGCONFIG
+ PYGTK_LIBS
+ PYGTK_CFLAGS
+@@ -3101,16 +3100,6 @@ $as_echo "no" >&6; }
+ fi
+
+
+- if test "$PKGCONFIG" != "no" ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking PYTHONPATH env variable for PyGTK" >&5
+-$as_echo_n "checking PYTHONPATH env variable for PyGTK... " >&6; }
+- PYTHONPATH=$($PKGCONFIG --variable=pyexecdir pygtk-2.0)
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHONPATH" >&5
+-$as_echo "$PYTHONPATH" >&6; }
+- fi
+-
+-export PYTHONPATH=$PYGTK_DIR:$PYTHONPATH
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk.glade" >&5
+ $as_echo_n "checking for gtk.glade... " >&6; }
+ prog="
+@@ -3221,7 +3210,6 @@ $as_echo "yes" >&6; }
+ :
+ fi
+
+-export PYTHONPATH=$PYGTK_DIR:$PYTHONPATH
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python gconf" >&5
+ $as_echo_n "checking for python gconf... " >&6; }
+ prog="
+diff --git a/configure.ac b/configure.ac
+index 44b917f..d4dbcc4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,15 +10,6 @@ AC_SUBST(PYGTK_CFLAGS)
+ AC_SUBST(PYGTK_LIBS)
+
+
+-AC_PATH_PROG( PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin)
+- if test "$PKGCONFIG" != "no" ; then
+- AC_MSG_CHECKING([PYTHONPATH env variable for PyGTK])
+- PYTHONPATH=$($PKGCONFIG --variable=pyexecdir pygtk-2.0)
+- AC_SUBST([PYTHONPATH])
+- AC_MSG_RESULT($PYTHONPATH)
+- fi
+-
+-export PYTHONPATH=$PYGTK_DIR:$PYTHONPATH
+ dnl check for libglade
+ AC_MSG_CHECKING(for gtk.glade)
+ prog="
+@@ -42,7 +33,6 @@ fi
+
+ PKG_CHECK_MODULES(GNOMEPYTHON, gnome-python-2.0 >= 2.12.0)
+
+-export PYTHONPATH=$PYGTK_DIR:$PYTHONPATH
+ dnl check for python-gconf
+ AC_MSG_CHECKING(for python gconf)
+ prog="
+diff --git a/desktop/Makefile.in b/desktop/Makefile.in
+index 76ccd31..816be0f 100644
+--- a/desktop/Makefile.in
++++ b/desktop/Makefile.in
+@@ -146,7 +146,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ PYGTK_CFLAGS = @PYGTK_CFLAGS@
+ PYGTK_LIBS = @PYGTK_LIBS@
+ PYTHON = @PYTHON@
+-PYTHONPATH = @PYTHONPATH@
+ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+ PYTHON_PLATFORM = @PYTHON_PLATFORM@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+diff --git a/help/Makefile.in b/help/Makefile.in
+index 13eadd8..11efdfc 100644
+--- a/help/Makefile.in
++++ b/help/Makefile.in
+@@ -146,7 +146,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ PYGTK_CFLAGS = @PYGTK_CFLAGS@
+ PYGTK_LIBS = @PYGTK_LIBS@
+ PYTHON = @PYTHON@
+-PYTHONPATH = @PYTHONPATH@
+ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+ PYTHON_PLATFORM = @PYTHON_PLATFORM@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+diff --git a/icons/Makefile.in b/icons/Makefile.in
+index 885bc7a..e6da76a 100644
+--- a/icons/Makefile.in
++++ b/icons/Makefile.in
+@@ -145,7 +145,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ PYGTK_CFLAGS = @PYGTK_CFLAGS@
+ PYGTK_LIBS = @PYGTK_LIBS@
+ PYTHON = @PYTHON@
+-PYTHONPATH = @PYTHONPATH@
+ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+ PYTHON_PLATFORM = @PYTHON_PLATFORM@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+diff --git a/servers/Makefile.in b/servers/Makefile.in
+index fe64883..5ae5885 100644
+--- a/servers/Makefile.in
++++ b/servers/Makefile.in
+@@ -146,7 +146,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ PYGTK_CFLAGS = @PYGTK_CFLAGS@
+ PYGTK_LIBS = @PYGTK_LIBS@
+ PYTHON = @PYTHON@
+-PYTHONPATH = @PYTHONPATH@
+ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+ PYTHON_PLATFORM = @PYTHON_PLATFORM@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 95ee5c1..a2f0d2a 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -151,7 +151,6 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ PYGTK_CFLAGS = @PYGTK_CFLAGS@
+ PYGTK_LIBS = @PYGTK_LIBS@
+ PYTHON = @PYTHON@
+-PYTHONPATH = @PYTHONPATH@
+ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+ PYTHON_PLATFORM = @PYTHON_PLATFORM@
+ PYTHON_PREFIX = @PYTHON_PREFIX@
+diff --git a/src/config.py b/src/config.py
+index 69a7cf8..bf118e0 100644
+--- a/src/config.py
++++ b/src/config.py
+@@ -21,7 +21,7 @@ version = "2.1.1"
+ image_dir = "/usr/local/share/pixmaps/gnome-schedule"
+ gs_dir = "/usr/local/share/gnome-schedule"
+ glade_dir = gs_dir
+-xwrapper_exec = "PYTHONPATH=::/usr/lib/python2.6/site-packages/gtk-2.0/:$PYTHONPATH /usr/bin/python /usr/local/share/gnome-schedule/xwrapper.py"
++xwrapper_exec = "/usr/bin/python /usr/local/share/gnome-schedule/xwrapper.py"
+ locale_dir = "/usr/local/share/locale"
+ crontabbin = "/usr/bin/crontab"
+ atbin = "/usr/bin/at"
+diff --git a/src/config.py.in b/src/config.py.in
+index 2096c6d..abcab14 100644
+--- a/src/config.py.in
++++ b/src/config.py.in
+@@ -21,7 +21,7 @@ version = "@VERSION@"
+ image_dir = "@prefix@/share/pixmaps/gnome-schedule"
+ gs_dir = "@prefix@/share/gnome-schedule"
+ glade_dir = gs_dir
+-xwrapper_exec = "pythonpa...@pythonpath@/gtk-2.0/:$PYTHONPATH @PYTHON@ @prefix@/share/gnome-schedule/xwrapper.py"
++xwrapper_exec = "@PYTHON@ @prefix@/share/gnome-schedule/xwrapper.py"
+ locale_dir = "@prefix@/share/locale"
+ crontabbin = "@CRONTAB_CONFIG@"
+ atbin = "@AT_CONFIG@"
+diff --git a/src/gnome-schedule b/src/gnome-schedule
+index 2734623..1a099f4 100644
+--- a/src/gnome-schedule
++++ b/src/gnome-schedule
+@@ -1,2 +1,2 @@
+ #! /bin/sh
+-PYTHONPATH=::/usr/lib/python2.6/site-packages/gtk-2.0/:$PYTHONPATH /usr/bin/python /usr/local/share/gnome-schedule/gnome-schedule.py $1
++/usr/bin/python /usr/local/share/gnome-schedule/gnome-schedule.py $1
+diff --git a/src/gnome-schedule.in b/src/gnome-schedule.in
+index 7777e2d..3484740 100644
+--- a/src/gnome-schedule.in
++++ b/src/gnome-schedule.in
+@@ -1,2 +1,2 @@
+ #! /bin/sh
+-pythonpa...@pythonpath@/gtk-2.0/:$PYTHONPATH @PYTHON@ @prefix@/share/gnome-schedule/gnome-schedule.py $1
+...@python@ @prefix@/share/gnome-schedule/gnome-schedule.py $1
+--
+1.7.2.3
+
signature.asc
Description: Digital signature
