Tags 383616 +pending
Tags 382958 +pending
Thanks
Hi!
I have prepared a fixed package of gnopernicus. It takes care of 383616
and 382958 which are RC bugs, it applies the patch by Loïc Minier for
383616, and the patch I sent for 382958, combined with the one that James
Westby provided.
It also fixes an unreported bug that I found out when testing the package,
which made gnopernicus segfault.
Since this package adds simplepatchsys support, and fixes an unreported
bug, I'm going to upload it to the 5-day delayed queue.
If you decide to upload the package yourself, please keep in mind what Loïc
Minier said about the version of the script.
I'm attaching the full interdiff output of the NMU I'm going to do.
--
Love,
Marga.
diff -u gnopernicus-1.0.5/debian/changelog gnopernicus-1.0.5/debian/changelog
--- gnopernicus-1.0.5/debian/changelog
+++ gnopernicus-1.0.5/debian/changelog
@@ -1,3 +1,21 @@
+gnopernicus (1.0.5-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload to fix Failure To Build From Source and to prevent
+ breaking ScrollKeeper's database.
+ * Included cdbs' simplepatchsys to include the needed patch.
+ * Updated debhelper Build-Depends as required by cdbs.
+ * Added debian/patches/01-libke-cflags.patch that makes libgtk-2.0
+ a dependency of libke in configure.in. Thanks to James Westby
+ for the patch. (Closes: #382958).
+ * Stopped shipping /var/scrollkeeper.
+ * Added a postinst snippet to fix systems where gnopernicus broke the
+ scrollkeeper database. Thanks to Loic Minier for the patch.
+ (Closes: #383616)
+ * Added debian/patches/02_fix_segfault.patch to fix a segfault when
+ starting gnopernicus without a running gconf instance.
+
+ -- Margarita Manterola <[EMAIL PROTECTED]> Wed, 23 Aug 2006 20:15:26 -0300
+
gnopernicus (1.0.5-1) unstable; urgency=low
* New upstream release
diff -u gnopernicus-1.0.5/debian/control gnopernicus-1.0.5/debian/control
--- gnopernicus-1.0.5/debian/control
+++ gnopernicus-1.0.5/debian/control
@@ -2,7 +2,7 @@
Section: x11
Priority: optional
Maintainer: Mario Lang <[EMAIL PROTECTED]>
-Build-Depends: cdbs, debhelper (>= 4.0.0), libgnome2-dev (>= 2.14.1-1),
+Build-Depends: cdbs, debhelper (>= 4.1.0), libgnome2-dev (>= 2.14.1-1),
libgtk2.0-dev (>= 2.4.0), libgnomeui-dev (>= 2.14.1-1), gconf2,
libgnomevfs2-dev (>= 2.14.1-1), libgnome-speech3-dev (>= 1:0.3.10-1),
libatspi-dev (>= 1.7.7-2), libgnome-mag-dev (>= 1:0.11.10),
diff -u gnopernicus-1.0.5/debian/rules gnopernicus-1.0.5/debian/rules
--- gnopernicus-1.0.5/debian/rules
+++ gnopernicus-1.0.5/debian/rules
@@ -5,6 +5,7 @@
include /usr/share/cdbs/1/rules/buildcore.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_CONFIGURE_EXTRA_FLAGS := --enable-brltty
@@ -15,0 +17,4 @@
+
+binary-post-install/gnopernicus::
+ rm -rf debian/gnopernicus/var/scrollkeeper
+ -rmdir debian/gnopernicus/var
only in patch2:
unchanged:
--- gnopernicus-1.0.5.orig/debian/patches/01-libke-cflags.patch
+++ gnopernicus-1.0.5/debian/patches/01-libke-cflags.patch
@@ -0,0 +1,93 @@
+--- gnopernicus/configure.in.untouched 2006-08-23 18:47:58.387157830 -0300
++++ gnopernicus/configure.in 2006-08-23 18:38:34.110165210 -0300
+@@ -555,7 +555,8 @@
+ PKG_CHECK_MODULES(LIBKE, \
+ cspi-1.0 >= $CSPI_REQUIRED \
+ gconf-2.0 >= $GCONF_REQUIRED \
+- glib-2.0 >= $GLIB_REQUIRED )
++ glib-2.0 >= $GLIB_REQUIRED
++ gdk-2.0 >= $GTK_REQUIRED )
+ AC_SUBST(LIBKE_LIBS)
+ AC_SUBST(LIBKE_CFLAGS)
+
+--- gnopernicus-untouched/configure 2006-08-23 18:38:34.223147389 -0300
++++ gnopernicus-1.0.5/configure 2006-08-23 18:42:33.444413335 -0300
+@@ -23891,18 +23891,21 @@
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
+ cspi-1.0 >= \$CSPI_REQUIRED \\
+ gconf-2.0 >= \$GCONF_REQUIRED \\
+- glib-2.0 >= \$GLIB_REQUIRED \"") >&5
++ glib-2.0 >= \$GLIB_REQUIRED
++ gdk-2.0 >= \$GTK_REQUIRED \"") >&5
+ ($PKG_CONFIG --exists --print-errors "\
+ cspi-1.0 >= $CSPI_REQUIRED \
+ gconf-2.0 >= $GCONF_REQUIRED \
+- glib-2.0 >= $GLIB_REQUIRED ") 2>&5
++ glib-2.0 >= $GLIB_REQUIRED
++ gdk-2.0 >= $GTK_REQUIRED ") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_LIBKE_CFLAGS=`$PKG_CONFIG --cflags "\
+ cspi-1.0 >= $CSPI_REQUIRED \
+ gconf-2.0 >= $GCONF_REQUIRED \
+- glib-2.0 >= $GLIB_REQUIRED " 2>/dev/null`
++ glib-2.0 >= $GLIB_REQUIRED
++ gdk-2.0 >= $GTK_REQUIRED " 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -23914,18 +23917,21 @@
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\\
+ cspi-1.0 >= \$CSPI_REQUIRED \\
+ gconf-2.0 >= \$GCONF_REQUIRED \\
+- glib-2.0 >= \$GLIB_REQUIRED \"") >&5
++ glib-2.0 >= \$GLIB_REQUIRED
++ gdk-2.0 >= \$GTK_REQUIRED \"") >&5
+ ($PKG_CONFIG --exists --print-errors "\
+ cspi-1.0 >= $CSPI_REQUIRED \
+ gconf-2.0 >= $GCONF_REQUIRED \
+- glib-2.0 >= $GLIB_REQUIRED ") 2>&5
++ glib-2.0 >= $GLIB_REQUIRED
++ gdk-2.0 >= $GTK_REQUIRED ") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_LIBKE_LIBS=`$PKG_CONFIG --libs "\
+ cspi-1.0 >= $CSPI_REQUIRED \
+ gconf-2.0 >= $GCONF_REQUIRED \
+- glib-2.0 >= $GLIB_REQUIRED " 2>/dev/null`
++ glib-2.0 >= $GLIB_REQUIRED
++ gdk-2.0 >= $GTK_REQUIRED " 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -23937,14 +23943,16 @@
+ LIBKE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "\
+ cspi-1.0 >= $CSPI_REQUIRED \
+ gconf-2.0 >= $GCONF_REQUIRED \
+- glib-2.0 >= $GLIB_REQUIRED "`
++ glib-2.0 >= $GLIB_REQUIRED
++ gdk-2.0 >= $GTK_REQUIRED "`
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBKE_PKG_ERRORS" 1>&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (\
+ cspi-1.0 >= $CSPI_REQUIRED \
+ gconf-2.0 >= $GCONF_REQUIRED \
+- glib-2.0 >= $GLIB_REQUIRED ) were not met.
++ glib-2.0 >= $GLIB_REQUIRED
++ gdk-2.0 >= $GTK_REQUIRED ) were not met.
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+@@ -23954,7 +23962,8 @@
+ echo "$as_me: error: Package requirements (\
+ cspi-1.0 >= $CSPI_REQUIRED \
+ gconf-2.0 >= $GCONF_REQUIRED \
+- glib-2.0 >= $GLIB_REQUIRED ) were not met.
++ glib-2.0 >= $GLIB_REQUIRED
++ gdk-2.0 >= $GTK_REQUIRED ) were not met.
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
only in patch2:
unchanged:
--- gnopernicus-1.0.5.orig/debian/patches/02_fix_segfault.patch
+++ gnopernicus-1.0.5/debian/patches/02_fix_segfault.patch
@@ -0,0 +1,10 @@
+--- gnopernicus-1.0.5-fixed/gnopi/gnopiconf.c 2005-08-22 06:42:14.000000000
-0300
++++ gnopernicus-1.0.5/gnopi/gnopiconf.c 2006-08-23 19:45:07.167312214
-0300
+@@ -36,6 +36,7 @@
+ gboolean
+ gnopiconf_gconf_client_init (void)
+ {
++ g_type_init();
+ gnopernicus_client = gconf_client_get_default ();
+
+ if (gnopernicus_client == NULL)
only in patch2:
unchanged:
--- gnopernicus-1.0.5.orig/debian/gnopernicus.postinst
+++ gnopernicus-1.0.5/debian/gnopernicus.postinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# version 1.0.5-1 started shipping /var/lib/scrollkeeper erroneously, hence
+# the database was overwritten and needs a full rebuild
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" ge "1.0.5-1" && dpkg
--compare-versions "$2" lt "1.0.5-1.1" && which scrollkeeper-rebuilddb
>/dev/null 2>&1; then
+ echo "Upgrade from broken Gnopernicus version detected, running
scrollkeeper-rebuilddb..."
+ scrollkeeper-rebuilddb -q
+fi
+
+#DEBHELPER#
+
