Bug#605167: Less hacking patch

[Jakub Wilk]

* Dmitrijs Ledkovs <dmitrij.led...@ubuntu.com>, 2010-12-11, 18:47:

Package: gnome-schedule
-Architecture: any
+Architecture: all
Depends: ${python:Depends}, python-gtk2, at, anacron, python-gnome2, 
python-glade2, ${misc:Depends}
Description: GNOME scheduler for automatic tasks
 GNOME GUI for configuring a users' cron (automatic jobs).

I'm not sure if the release team will be happy with the above change...

--- gnome-schedule2.1.1-3/debian/patches/03_distclean.dpatch    2009-11-08 
17:17:39 +0000
+++ gnome-schedule2.1.1-3.1/debian/patches/03_distclean.dpatch  2010-12-11 
11:10:32 +0000
@@ -5,25 +5,14 @@
## DP: don't remove gnome-doc-utils.make in the distclean target.

@DPATCH@
-diff -urNad gnome-schedule-2.0.2~/Makefile.am gnome-schedule-2.0.2/Makefile.am
--- gnome-schedule-2.0.2~/Makefile.am   2007-12-21 08:30:24.000000000 -0500
+++ gnome-schedule-2.0.2/Makefile.am    2008-03-09 22:49:35.000000000 -0500
@@ -11,7 +11,6 @@
        intltool-merge          \
        intltool-update         \
-       po/.intltool-merge-cache \
--      gnome-doc-utils.make

-       gnome-doc-utils.make \
-diff -urNad gnome-schedule-2.0.2~/Makefile.in gnome-schedule-2.0.2/Makefile.in
---- gnome-schedule-2.0.2~/Makefile.in  2008-02-08 13:21:45.000000000 -0500
-+++ gnome-schedule-2.0.2/Makefile.in   2008-03-09 22:54:35.000000000 -0500
-@@ -239,7 +239,6 @@
-       intltool-merge          \
-       intltool-update         \
-       po/.intltool-merge-cache \
--      gnome-doc-utils.make
+-      po/.intltool-merge-cache \
+-      gnome-doc-utils.make
++      po/.intltool-merge-cache

        gnome-doc-utils.make \

- - EXTRA_DIST = \ EXTRA_DIST = \

This change is not documented in the changelog AFAICS.

+--- a/configure.ac
++++ b/configure.ac
+@@ -10,15 +10,6 @@ AC_SUBST(PYGTK_CFLAGS)
+ AC_SUBST(PYGTK_LIBS)

+-  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

+ dnl check for python-gconf
+ AC_MSG_CHECKING(for python gconf)
+ prog="

+ + +-AC_PATH_PROG( PKGCONFIG, pkg-config, no, $PATH:/usr/bin:/usr/local/bin) + + PKG_CHECK_MODULES(GNOMEPYTHON, gnome-python-2.0 >= 2.12.0) + +-export PYTHONPATH=$PYGTK_DIR:$PYTHONPATH

If you run the configure script from an untrusted directory, you are doomed anyway (the script created files with predictable names). IOW, you are not supposed to do that. While the hunk is technically correct, I'd omit it, so that we don't need to regenerate ./configure.

+diff --git a/desktop/Makefile.in b/desktop/Makefile.in
+index 76ccd31..816be0f 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@"

OK.

+diff --git a/src/gnome-schedule b/src/gnome-schedule
+index 2734623..1a099f4 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

OK.

--- gnome-schedule2.1.1-3/debian/rules  2009-11-09 10:01:57 +0000
+++ gnome-schedule2.1.1-3.1/debian/rules        2010-12-11 18:16:11 +0000
@@ -18,16 +18,10 @@

CFLAGS = -Wall -g -O3

-config.status: configure
+config.status:
        dh_testdir
-       for i in config.guess config.sub ; do \
-               if test -e /usr/share/misc/$$i ; then \
-                       if ! test -e $$i.orig ; then \
-                               mv $$i $$i.orig ; \
-                               cp --remove-destination /usr/share/misc/$$i $$i 
; \
-                       fi ; \
-               fi ; \

+       dh_autotools-dev_updateconfig
        CFLAGS="$(CFLAGS)" ./configure $(CONFFLAGS) --prefix=/usr 
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-scrollkeeper 
--with-help-dir=\$${prefix}/share/gnome/help --with-omf-dir=\$${prefix}/share/omf

build: build-stamp
@@ -49,7 +43,9 @@
        dh_testroot
        rm -f build-stamp
        [ ! -f Makefile ] || $(MAKE) distclean

+       dh_autotools-dev_restoreconfig
+       dh_clean

- done + dh_autoreconf - dh_clean + dh_autoreconf_clean

--
Jakub Wilk

I think it's too late in the release process for this change (and it wouldn't be suitable for an NMU anyway).

signature.asc
Description: Digital signature