Package: guidedog
Version: 1.0.0-4
Severity: normal
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu intrepid ubuntu-patch
Hi,
In Ubuntu, we've fixed two bugs in the guidedog package that we thought
you might be interested in adopting. The patch is attached for your
consideration.
* Symlink .desktop file to correct location so GNOME can read it [0]
* Patch guidedog.cpp with quilt to work with non *sh shells [1]
Thanks,
Iain
[0] https://bugs.launchpad.net/ubuntu/+source/guidedog/+bug/217232
[1] https://bugs.launchpad.net/ubuntu/+source/guidedog/+bug/124230
-- System Information:
Debian Release: lenny/sid
APT prefers hardy-updates
APT policy: (500, 'hardy-updates'), (500, 'hardy-security'), (500,
'hardy-backports'), (500, 'hardy')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.24-17-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u guidedog-1.0.0/debian/changelog guidedog-1.0.0/debian/changelog
diff -u guidedog-1.0.0/debian/control guidedog-1.0.0/debian/control
--- guidedog-1.0.0/debian/control
+++ guidedog-1.0.0/debian/control
@@ -3,6 +3,6 @@
Priority: optional
Maintainer: Paul Cupis <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.51), kdelibs-dev
+Build-Depends: debhelper (>= 5.0.51), kdelibs-dev, quilt (>= 0.40)
Standards-Version: 3.7.3
Package: guidedog
diff -u guidedog-1.0.0/debian/rules guidedog-1.0.0/debian/rules
--- guidedog-1.0.0/debian/rules
+++ guidedog-1.0.0/debian/rules
@@ -5,6 +5,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
# This is the debhelper compatibility version to use.
export DH_COMPAT=4
@@ -22,7 +24,7 @@
INSTALL_PROGRAM += -s
endif
-config.status: configure
+config.status: configure $(QUILT_STAMPFN)
dh_testdir
# configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info --disable-rpath
--with-qt-includes=/usr/include/qt3
@@ -38,7 +40,7 @@
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
only in patch2:
unchanged:
--- guidedog-1.0.0.orig/debian/guidedog.links
+++ guidedog-1.0.0/debian/guidedog.links
@@ -0,0 +1 @@
+usr/share/applications/guidedog.desktop
usr/share/applnk/System/guidedog.desktop
only in patch2:
unchanged:
--- guidedog-1.0.0.orig/debian/patches/series
+++ guidedog-1.0.0/debian/patches/series
@@ -0,0 +1 @@
+alternative_shell_fixes.patch
only in patch2:
unchanged:
--- guidedog-1.0.0.orig/debian/patches/alternative_shell_fixes.patch
+++ guidedog-1.0.0/debian/patches/alternative_shell_fixes.patch
@@ -0,0 +1,15 @@
+Index: guidedog-1.0.0/guidedog/guidedog.cpp
+===================================================================
+--- guidedog-1.0.0.orig/guidedog/guidedog.cpp 2008-07-01 00:44:07.448017989
+0100
++++ guidedog-1.0.0/guidedog/guidedog.cpp 2008-07-01 00:44:54.925061415
+0100
+@@ -1479,7 +1479,9 @@
+ }
+ cr.setPlainCaption(i18n("Modify Routing Configuration"));
+ cr.setHeading(i18n("Configuring...\n\nOutput:"));
+- cr.run(QString("export GUIDEDOG_VERBOSE=1;")+tmpfile.name());
++ //cr.run(QString("export GUIDEDOG_VERBOSE=1;")+tmpfile.name());
++ putenv("GUIDEDOG_VERBOSE=1");
++ cr.run(tmpfile.name());
+ systemconfigmodified = true;
+ commandrunnersize = cr.size();
+ return true;
