tags 554047 + pending tags 643362 + pending thanks Dear maintainer,
I've prepared an NMU for cellwriter (versioned as 1.3.4-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Various Artists: Manuel Ponce Sonatina Meridional Campo Allegretto
diff -u cellwriter-1.3.4/debian/rules cellwriter-1.3.4/debian/rules --- cellwriter-1.3.4/debian/rules +++ cellwriter-1.3.4/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk # Only install the TODO into the package directory DEB_INSTALL_DOCS_ALL := TODO diff -u cellwriter-1.3.4/debian/changelog cellwriter-1.3.4/debian/changelog --- cellwriter-1.3.4/debian/changelog +++ cellwriter-1.3.4/debian/changelog @@ -1,3 +1,17 @@ +cellwriter (1.3.4-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS with binutils-gold": add patch from Ubuntu / Mahyuddin Susanto: + + debian/patches/binutils-gold.patch: + - fix FTBFS with ld --no-add-needed (LP: #696848) + (Closes: #554047) + * Fix "FTBFS: src/statusicon.c:215:17: error: format not a string + literal and no format arguments [-Werror=format-security]": + add patch fix-string-format-error.patch from Eric Alexander. + (Closes: #643362) + + -- gregor herrmann <gre...@debian.org> Sun, 20 Nov 2011 14:40:26 +0100 + cellwriter (1.3.4-1) unstable; urgency=low * New upstream release only in patch2: unchanged: --- cellwriter-1.3.4.orig/debian/patches/binutils-gold.patch +++ cellwriter-1.3.4/debian/patches/binutils-gold.patch @@ -0,0 +1,26 @@ +Description: fix FTBFS with ld --no-add-needed +Author: Mahyuddin Susanto <udi...@gmail.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/696848 +Bug-Debian: http://bugs.debian.org/554047 + +--- cellwriter-1.3.4.orig/Makefile.in ++++ cellwriter-1.3.4/Makefile.in +@@ -73,7 +73,7 @@ + wordfreq.$(OBJEXT) preprocess.$(OBJEXT) keywidget.$(OBJEXT) \ + singleinstance.$(OBJEXT) statusicon.$(OBJEXT) $(am__objects_1) + cellwriter_OBJECTS = $(am_cellwriter_OBJECTS) +-cellwriter_LDADD = $(LDADD) ++cellwriter_LDADD = $(LDADD) -lX11 -lXext + cellwriter_DEPENDENCIES = + DEFAULT_INCLUDES = -I.@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp +--- cellwriter-1.3.4.orig/Makefile.am ++++ cellwriter-1.3.4/Makefile.am +@@ -1,6 +1,6 @@ + + INCLUDES = @GTK_CFLAGS@ @GNOME_CFLAGS@ +-LDADD = @GTK_LIBS@ @GNOME_LIBS@ ++LDADD = @GTK_LIBS@ @GNOME_LIBS@ -lX11 -lXext + AM_CFLAGS = -DDATADIR=\"$(datadir)\" -DPKGDATADIR=\"$(pkgdatadir)\" + + bin_PROGRAMS = cellwriter only in patch2: unchanged: --- cellwriter-1.3.4.orig/debian/patches/fix-string-format-error.patch +++ cellwriter-1.3.4/debian/patches/fix-string-format-error.patch @@ -0,0 +1,13 @@ +Index: cellwriter-1.3.4/src/statusicon.c +=================================================================== +--- cellwriter-1.3.4.orig/src/statusicon.c 2007-11-10 00:13:02.000000000 -0500 ++++ cellwriter-1.3.4/src/statusicon.c 2011-11-11 10:59:14.641565609 -0500 +@@ -212,7 +212,7 @@ + icon_path = g_build_filename(DATADIR, ICON_PATH PACKAGE ".svg", NULL); + if (!(pixbuf = gdk_pixbuf_new_from_file(icon_path, &error))) { + status_icon = NULL; +- g_warning(error->message); ++ g_warning("%s", error->message); + g_warning("Failed to load status icon '%s'", icon_path); + return; + }
signature.asc
Description: Digital signature
