tags 654218 + patch tags 654218 + pending tags 555177 + patch tags 555177 + pending thanks
Dear maintainer,
I've prepared an NMU for libgconf-bridge (versioned as 0.1-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
--
Regards,
dai
GPG Fingerprint = 0B29 D88E 42E6 B765 B8D8 EA50 7839 619D D439 668E
diff -Nru libgconf-bridge-0.1/debian/changelog libgconf-bridge-0.1/debian/changelog --- libgconf-bridge-0.1/debian/changelog 2012-01-08 17:06:51.000000000 +0900 +++ libgconf-bridge-0.1/debian/changelog 2012-01-08 16:51:54.000000000 +0900 @@ -1,3 +1,21 @@ +libgconf-bridge (0.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * FTBFS with binutils-gold (Closes: #555177). + - debian/patches/fix-ftbfs-binutils-gold.patch: added. + thanks to Artur Rona <ari-tc...@tlen.pl>. + * FTBFS on armhf/s390x, reproduced on amd64: error: + format not a string literal and no format arguments + [-Werror=format-security] (Closes: #654218). + - debian/patches/gconf-bridge-werror.diff + thanks to peter green <plugw...@p10link.net>. + * source format is 3.0 (quilt). + - debian/source/format: new file. + - debian/rules: include patchsys-quilt.mk. + - debian/control: add quilt to Build-Depends. + + -- HIGUCHI Daisuke (VDR dai) <d...@debian.org> Sun, 08 Jan 2012 16:33:26 +0900 + libgconf-bridge (0.1-2) unstable; urgency=low * Add API documentation to -dev (Closes: #448172) diff -Nru libgconf-bridge-0.1/debian/control libgconf-bridge-0.1/debian/control --- libgconf-bridge-0.1/debian/control 2012-01-08 17:06:51.000000000 +0900 +++ libgconf-bridge-0.1/debian/control 2012-01-08 16:37:05.000000000 +0900 @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Ross Burton <r...@debian.org> -Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libgconf2-dev, libgtk2.0-dev, gtk-doc-tools +Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libgconf2-dev, libgtk2.0-dev, gtk-doc-tools, quilt Standards-Version: 3.7.2 Package: libgconf-bridge0 diff -Nru libgconf-bridge-0.1/debian/patches/fix-ftbfs-binutils-gold.patch libgconf-bridge-0.1/debian/patches/fix-ftbfs-binutils-gold.patch --- libgconf-bridge-0.1/debian/patches/fix-ftbfs-binutils-gold.patch 1970-01-01 09:00:00.000000000 +0900 +++ libgconf-bridge-0.1/debian/patches/fix-ftbfs-binutils-gold.patch 2012-01-08 16:32:18.000000000 +0900 @@ -0,0 +1,28 @@ +Description: Fix FTBFS with binutils-gold by missing linking -lgtk-x11-2.0 -lgobject-2.0 -lgconf-2. +Bug-Debian: http://bugs.debian.org/555177 +Author: Artur Rona <ari-tc...@ubuntu.com> + +--- libgconf-bridge-0.1.orig/tests/Makefile.am ++++ libgconf-bridge-0.1/tests/Makefile.am +@@ -5,7 +5,7 @@ + noinst_PROGRAMS = test + + test_SOURCES = test.c +-test_LDADD = $(top_builddir)/libgconf-bridge/libgconf-bridge.la ++test_LDADD = $(top_builddir)/libgconf-bridge/libgconf-bridge.la -lgtk-x11-2.0 -lgobject-2.0 -lgconf-2 + + CLEANFILES = $(BUILT_SOURCES) + DISTCLEANFILES = $(BUILT_SOURCES) +only in patch2: +unchanged: +--- libgconf-bridge-0.1.orig/tests/Makefile.in ++++ libgconf-bridge-0.1/tests/Makefile.in +@@ -196,7 +196,7 @@ + -I$(top_srcdir) -I$(top_builddir) -Werror + + test_SOURCES = test.c +-test_LDADD = $(top_builddir)/libgconf-bridge/libgconf-bridge.la ++test_LDADD = $(top_builddir)/libgconf-bridge/libgconf-bridge.la -lgtk-x11-2.0 -lgobject-2.0 -lgconf-2 + CLEANFILES = $(BUILT_SOURCES) + DISTCLEANFILES = $(BUILT_SOURCES) + MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES) diff -Nru libgconf-bridge-0.1/debian/patches/gconf-bridge-werror.diff libgconf-bridge-0.1/debian/patches/gconf-bridge-werror.diff --- libgconf-bridge-0.1/debian/patches/gconf-bridge-werror.diff 1970-01-01 09:00:00.000000000 +0900 +++ libgconf-bridge-0.1/debian/patches/gconf-bridge-werror.diff 2012-01-08 16:43:49.000000000 +0900 @@ -0,0 +1,26 @@ +Description: Fix FTBFS by the format security error. +Bug-Debian: http://bugs.debian.org/654218 +Author: peter green <plugw...@p10link.net> + +diff -ur libgconf-bridge-0.1/libgconf-bridge/gconf-bridge.c libgconf-bridge-0.1.new/libgconf-bridge/gconf-bridge.c +--- libgconf-bridge-0.1/libgconf-bridge/gconf-bridge.c 2005-12-15 12:13:36.000000000 +0000 ++++ libgconf-bridge-0.1.new/libgconf-bridge/gconf-bridge.c 2012-01-08 03:08:19.000000000 +0000 +@@ -1169,16 +1169,13 @@ + g_warning ("GConf error:\n %s", error->message); + + if (!shown_dialog) { +- char *message; + GtkWidget *dlg; + +- message = g_strdup_printf (_("GConf error: %s"), +- error->message); + dlg = gtk_message_dialog_new (NULL, 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, +- message); +- g_free (message); ++ _("GConf error: %s"), ++ error->message); + + gtk_message_dialog_format_secondary_text + (GTK_MESSAGE_DIALOG (dlg), diff -Nru libgconf-bridge-0.1/debian/patches/series libgconf-bridge-0.1/debian/patches/series --- libgconf-bridge-0.1/debian/patches/series 1970-01-01 09:00:00.000000000 +0900 +++ libgconf-bridge-0.1/debian/patches/series 2012-01-08 16:51:43.000000000 +0900 @@ -0,0 +1,2 @@ +fix-ftbfs-binutils-gold.patch +gconf-bridge-werror.diff diff -Nru libgconf-bridge-0.1/debian/rules libgconf-bridge-0.1/debian/rules --- libgconf-bridge-0.1/debian/rules 2012-01-08 17:06:51.000000000 +0900 +++ libgconf-bridge-0.1/debian/rules 2012-01-08 16:36:35.000000000 +0900 @@ -1,6 +1,7 @@ #! /usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/utils.mk diff -Nru libgconf-bridge-0.1/debian/source/format libgconf-bridge-0.1/debian/source/format --- libgconf-bridge-0.1/debian/source/format 1970-01-01 09:00:00.000000000 +0900 +++ libgconf-bridge-0.1/debian/source/format 2012-01-08 16:50:05.000000000 +0900 @@ -0,0 +1 @@ +3.0 (quilt)
signature.asc
Description: Digital signature
