Package: gnoemoe Version: 2.2.0+dfsg-2.1 Severity: normal Tags: patch pending
Dear maintainer, I've prepared an NMU for gnoemoe (versioned as 2.2.0+dfsg-2.2) and uploaded it to DELAYED/3. Please feel free to tell me if I should delay it longer. Regards. diff -u gnoemoe-2.2.0+dfsg/debian/changelog gnoemoe-2.2.0+dfsg/debian/changelog --- gnoemoe-2.2.0+dfsg/debian/changelog +++ gnoemoe-2.2.0+dfsg/debian/changelog @@ -1,3 +1,16 @@ +gnoemoe (2.2.0+dfsg-2.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/04_unused-but-set-variable.diff: Unset -Werror to avoid FTBFS + with gcc 4.6 (Closes: #625346) + * debian/patches/05_libnotify-0.7.diff: Transition to libnotify 0.7 + (Closes: #630270) + * debian/patches/06_add_X11_link.diff: Be sure we are linking against X11 + library as we are using some functions (Closes: #554645) + * debian/control: Bump libnotify build-dependency to 0.7 + + -- Laurent Bigonville <bi...@debian.org> Wed, 03 Aug 2011 10:45:41 +0200 + gnoemoe (2.2.0+dfsg-2.1) unstable; urgency=low * Non-maintainer upload. diff -u gnoemoe-2.2.0+dfsg/debian/control gnoemoe-2.2.0+dfsg/debian/control --- gnoemoe-2.2.0+dfsg/debian/control +++ gnoemoe-2.2.0+dfsg/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Jesse van den Kieboom <je...@icecrew.nl> Uploaders: Paul van Tilburg <pau...@debian.org> -Build-Depends: debhelper (>= 5), cdbs, libglib2.0-dev (>= 2.8.0), libgtk2.0-dev (>= 2.8.0), libgtksourceview2.0-dev, libgnomevfs2-dev, libgnomeui-dev, libvte-dev (>= 0.16.2), libglade2-dev, ruby1.8-dev, ruby, libxml2-dev, intltool, libnotify-dev (>= 0.3.2) +Build-Depends: debhelper (>= 5), cdbs, libglib2.0-dev (>= 2.8.0), libgtk2.0-dev (>= 2.8.0), libgtksourceview2.0-dev, libgnomevfs2-dev, libgnomeui-dev, libvte-dev (>= 0.16.2), libglade2-dev, ruby1.8-dev, ruby, libxml2-dev, intltool, libnotify-dev (>= 0.7.0) Standards-Version: 3.8.3 Package: gnoemoe only in patch2: unchanged: --- gnoemoe-2.2.0+dfsg.orig/debian/patches/06_add_X11_link.diff +++ gnoemoe-2.2.0+dfsg/debian/patches/06_add_X11_link.diff @@ -0,0 +1,53 @@ +diff -Nur -x '*.orig' -x '*~' gnoemoe-2.2.0+dfsg//gnoemoe/Makefile.am gnoemoe-2.2.0+dfsg.new//gnoemoe/Makefile.am +--- gnoemoe-2.2.0+dfsg//gnoemoe/Makefile.am 2011-08-03 10:34:57.488506150 +0200 ++++ gnoemoe-2.2.0+dfsg.new//gnoemoe/Makefile.am 2011-08-03 10:34:58.248506150 +0200 +@@ -16,6 +16,7 @@ + bin_PROGRAMS = gnoemoe + BUILT_SOURCES = gm-marshal.c gm-marshal.h + ++gnoemoe_LDADD = + gnoemoe_SOURCES = + + include widgets/Makefile.include +@@ -44,7 +45,7 @@ + mcp/Makefile.include \ + mcp/Makefile.classes + +-gnoemoe_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) @RUBY_LIBS@ @NOTIFY_LIBS@ ++gnoemoe_LDADD += @PACKAGE_LIBS@ $(INTLLIBS) @RUBY_LIBS@ @NOTIFY_LIBS@ + + if HAS_PARSER + gnoemoe_LDADD += parser/libparser.la +diff -Nur -x '*.orig' -x '*~' gnoemoe-2.2.0+dfsg//gnoemoe/Makefile.in gnoemoe-2.2.0+dfsg.new//gnoemoe/Makefile.in +--- gnoemoe-2.2.0+dfsg//gnoemoe/Makefile.in 2011-08-03 10:34:57.488506150 +0200 ++++ gnoemoe-2.2.0+dfsg.new//gnoemoe/Makefile.in 2011-08-03 10:34:58.248506150 +0200 +@@ -370,6 +371,8 @@ + @RUBY_CFLAGS@ + + BUILT_SOURCES = gm-marshal.c gm-marshal.h ++gnoemoe_LDADD = -lX11 @PACKAGE_LIBS@ $(INTLLIBS) @RUBY_LIBS@ \ ++ @NOTIFY_LIBS@ $(am__append_1) + gnoemoe_SOURCES = $(widgetsdir)/gm-app-view.c \ + $(widgetsdir)/gm-app-view.h $(widgetsdir)/gm-commands.c \ + $(widgetsdir)/gm-commands.h $(widgetsdir)/gm-world-view.c \ +@@ -453,8 +456,6 @@ + mcp/Makefile.include \ + mcp/Makefile.classes + +-gnoemoe_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) @RUBY_LIBS@ @NOTIFY_LIBS@ \ +- $(am__append_1) + AM_CFLAGS = -Wall -Wsign-compare + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive +diff -Nur -x '*.orig' -x '*~' gnoemoe-2.2.0+dfsg//gnoemoe/widgets/Makefile.include gnoemoe-2.2.0+dfsg.new//gnoemoe/widgets/Makefile.include +--- gnoemoe-2.2.0+dfsg//gnoemoe/widgets/Makefile.include 2006-04-10 13:26:40.000000000 +0200 ++++ gnoemoe-2.2.0+dfsg.new//gnoemoe/widgets/Makefile.include 2011-08-03 10:34:58.248506150 +0200 +@@ -1,6 +1,8 @@ + ## Process this file with automake to produce Makefile.in + widgetsdir = widgets + ++gnoemoe_LDADD += -lX11 ++ + gnoemoe_SOURCES += \ + $(widgetsdir)/gm-app-view.c $(widgetsdir)/gm-app-view.h \ + $(widgetsdir)/gm-commands.c $(widgetsdir)/gm-commands.h \ only in patch2: unchanged: --- gnoemoe-2.2.0+dfsg.orig/debian/patches/04_unused-but-set-variable.diff +++ gnoemoe-2.2.0+dfsg/debian/patches/04_unused-but-set-variable.diff @@ -0,0 +1,21 @@ +diff -Nur -x '*.orig' -x '*~' gnoemoe-2.2.0+dfsg//gnoemoe/Makefile.am gnoemoe-2.2.0+dfsg.new//gnoemoe/Makefile.am +--- gnoemoe-2.2.0+dfsg//gnoemoe/Makefile.am 2006-07-03 23:27:03.000000000 +0200 ++++ gnoemoe-2.2.0+dfsg.new//gnoemoe/Makefile.am 2011-08-03 10:04:41.988506610 +0200 +@@ -66,4 +66,4 @@ + dist-hook: + cd $(distdir); rm -f $(BUILT_SOURCES) + +-AM_CFLAGS = -Werror -Wall -Wsign-compare ++AM_CFLAGS = -Wall -Wsign-compare +diff -Nur -x '*.orig' -x '*~' gnoemoe-2.2.0+dfsg//gnoemoe/Makefile.in gnoemoe-2.2.0+dfsg.new//gnoemoe/Makefile.in +--- gnoemoe-2.2.0+dfsg//gnoemoe/Makefile.in 2006-10-25 23:20:36.000000000 +0200 ++++ gnoemoe-2.2.0+dfsg.new//gnoemoe/Makefile.in 2011-08-03 10:04:49.938506608 +0200 +@@ -455,7 +455,7 @@ + + gnoemoe_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) @RUBY_LIBS@ @NOTIFY_LIBS@ \ + $(am__append_1) +-AM_CFLAGS = -Werror -Wall -Wsign-compare ++AM_CFLAGS = -Wall -Wsign-compare + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-recursive + only in patch2: unchanged: --- gnoemoe-2.2.0+dfsg.orig/debian/patches/05_libnotify-0.7.diff +++ gnoemoe-2.2.0+dfsg/debian/patches/05_libnotify-0.7.diff @@ -0,0 +1,30 @@ +Descripton: Add support for libnotify 0.7 +Author: Laurent Bigonville <bi...@debian.org> +Date: Wed, 03 Aug 2011 10:13:54 +0200 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630270 + +diff -Nur -x '*.orig' -x '*~' gnoemoe-2.2.0+dfsg//gnoemoe/widgets/eggtrayicon.c gnoemoe-2.2.0+dfsg.new//gnoemoe/widgets/eggtrayicon.c +--- gnoemoe-2.2.0+dfsg//gnoemoe/widgets/eggtrayicon.c 2006-03-24 14:02:24.000000000 +0100 ++++ gnoemoe-2.2.0+dfsg.new//gnoemoe/widgets/eggtrayicon.c 2011-08-03 10:11:08.398506512 +0200 +@@ -31,6 +31,9 @@ + #include <X11/Xatom.h> + #ifdef HAVE_NOTIFY + #include <libnotify/notify.h> ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif + #endif + + #ifndef EGG_COMPILATION +@@ -530,7 +533,11 @@ + } + + icon->notify->handle = notify_notification_new(primary, secondary, ++#if NOTIFY_CHECK_VERSION(0,7,0) ++ NULL); ++#else + NULL, NULL); ++#endif + + notify_notification_set_timeout (icon->notify->handle, timeout); + -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/debian-bugs-dist
