On dim, 2008-10-26 at 10:17 +0100, Yves-Alexis Perez wrote: > On dim, 2008-10-26 at 09:10 +0100, Yves-Alexis Perez wrote: > > Hey, > > > > as I'm working on splashy, I guess he'll just do a quick NMU for > this > > bug. Or are you working on a MU anyway? > > Attached intended debdiff.
I've uploaded the attached debdiff to DELAYED/1. It does *not* fix the breakage related to /etc/splashy replaced by a symlink, which bites upgrades in lenny/sid. Cheers, -- Yves-Alexis
diff -u splashy-0.3.10/debian/splashy.preinst splashy-0.3.10/debian/splashy.preinst --- splashy-0.3.10/debian/splashy.preinst +++ splashy-0.3.10/debian/splashy.preinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e # There was a bug in 0.2.x, it didn't remove /lib/splashy in postrm if [ -d /lib/splashy ]; then diff -u splashy-0.3.10/debian/control splashy-0.3.10/debian/control --- splashy-0.3.10/debian/control +++ splashy-0.3.10/debian/control @@ -15,12 +15,13 @@ # - libglib2.0-dev (>> 2.0.1-2) - due the need of static library # - perl - pod2man used to generate man pages # - libmagic-dev - needed to detect mimetypes +# - chrpath - for removing the rpath defined in /sbin/splashy # Build-Depends: cdbs (>= 0.4.23-1.1), quilt, autotools-dev, debhelper (>= 5), libdirectfb-dev (>= 1.0.1-9), libglib2.0-dev (>> 2.0.1-2), libtool, perl, - libmagic-dev -Standards-Version: 3.7.3 -XS-Vcs-Git: git://git.debian.org/git/splashy/splashy.git + libmagic-dev, chrpath +Standards-Version: 3.8.0 +XS-Vcs-Git: git://git.debian.org/git/splashy/debian/splashy.git XS-Vcs-Browser: http://git.debian.org/?p=splashy/splashy.git;a=summary # console-common is needed to not run keymap.sh on Debian earlier than Sid diff -u splashy-0.3.10/debian/changelog splashy-0.3.10/debian/changelog --- splashy-0.3.10/debian/changelog +++ splashy-0.3.10/debian/changelog @@ -1,3 +1,19 @@ +splashy (0.3.10-2.1) unstable; urgency=high + + * Non-maintainer upload, urgency=high for RC bug fix. + * 02_add_missing_headers added, fix FTBFBS with + DEB_BUILD_OPTIONS=noopt,nostrip. Thanks Bradley Smith closes: #501997 + * debian/splashy.{preinst,postinst,postrm}: use sh -e to make sure errors are + caught. + * debian/control: + - update standards version to 3.8.0, no changes needed. + - add build-dep on rpath. + - use the debian splashy repository instead of upstream one. + * debian/rules: + - remove rpath on /sbin/splashy. + + -- Yves-Alexis Perez <[EMAIL PROTECTED]> Tue, 28 Oct 2008 08:43:57 +0100 + splashy (0.3.10-2) unstable; urgency=low * Add build-depends on quilt. diff -u splashy-0.3.10/debian/rules splashy-0.3.10/debian/rules --- splashy-0.3.10/debian/rules +++ splashy-0.3.10/debian/rules @@ -15,6 +15,7 @@ debian/splashy/usr/share/initramfs-tools/hooks/libsplashy \ debian/splashy/usr/share/initramfs-tools/scripts/init-top/splashy \ debian/splashy/etc/console-tools/config.d/splashy + chrpath -d $(CURDIR)/debian/splashy/sbin/splashy # VERY UGLY HACK! See #297741 configure/splashy:: sed s/old_library=\'\'/old_library=\'libglib-2.0.a\'/ /usr/lib/libglib-2.0.la > src/libglib-2.0.la diff -u splashy-0.3.10/debian/splashy.postinst splashy-0.3.10/debian/splashy.postinst --- splashy-0.3.10/debian/splashy.postinst +++ splashy-0.3.10/debian/splashy.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e if [ -x "/etc/init.d/splashy" ]; then # This is needed to put the splashy links in the new location diff -u splashy-0.3.10/debian/splashy.postrm splashy-0.3.10/debian/splashy.postrm --- splashy-0.3.10/debian/splashy.postrm +++ splashy-0.3.10/debian/splashy.postrm @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e # until we have a debconf question, we won't do this: # for file in /boot/grub/menu.lst /boot/boot/grub/menu.lst; do diff -u splashy-0.3.10/debian/patches/series splashy-0.3.10/debian/patches/series --- splashy-0.3.10/debian/patches/series +++ splashy-0.3.10/debian/patches/series @@ -1,0 +2 @@ +02_add_missing_headers.patch only in patch2: unchanged: --- splashy-0.3.10.orig/debian/patches/02_add_missing_headers.patch +++ splashy-0.3.10/debian/patches/02_add_missing_headers.patch @@ -0,0 +1,12 @@ +Index: splashy-0.3.10/src/splashy_config-main.c +=================================================================== +--- splashy-0.3.10.orig/src/splashy_config-main.c 2008-10-12 16:28:15.000000000 +0100 ++++ splashy-0.3.10/src/splashy_config-main.c 2008-10-12 16:28:39.000000000 +0100 +@@ -41,6 +41,7 @@ + #include <unistd.h> /* getuid */ + #include <getopt.h> /* getopt_long */ + #include <glib/gi18n.h> ++#include <locale.h> + + #include "common_macros.h" + #include "splashycnf.h"
signature.asc
Description: This is a digitally signed message part
