On Sun, Jan 08, 2012 at 05:54:02PM +0100, Julien Cristau wrote: > > + * source format is 3.0 (quilt). > > + - debian/source/format: new file. > > + - debian/rules: include patchsys-quilt.mk. > > + - debian/control: add quilt to Build-Depends.
> Such changes are not normally appropriate in NMUs. They also seem
> confused, as you shouldn't need a build-dep or include patchsys-quilt.mk
> with 3.0 (quilt) source format.
My NMU cancelled. In such case, is appropriate way to apply patches
directly as soruce format 1.0?
--
Regards,
dai
GPG Fingerprint = 0B29 D88E 42E6 B765 B8D8 EA50 7839 619D D439 668E
diff -u libgconf-bridge-0.1/debian/changelog libgconf-bridge-0.1/debian/changelog
--- libgconf-bridge-0.1/debian/changelog
+++ libgconf-bridge-0.1/debian/changelog
@@ -1,3 +1,15 @@
+libgconf-bridge (0.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * FTBFS with binutils-gold (Closes: #555177).
+ - patch made by 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).
+ - patch made by peter green <plugw...@p10link.net>.
+
+ -- HIGUCHI Daisuke (VDR dai) <d...@debian.org> Mon, 09 Jan 2012 02:07:19 +0900
+
libgconf-bridge (0.1-2) unstable; urgency=low
* Add API documentation to -dev (Closes: #448172)
only in patch2:
unchanged:
--- libgconf-bridge-0.1.orig/libgconf-bridge/gconf-bridge.c
+++ libgconf-bridge-0.1/libgconf-bridge/gconf-bridge.c
@@ -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),
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)
only in patch2:
unchanged:
--- 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)
signature.asc
Description: Digital signature
