r35839 - in /attic/dasher/debian: changelog patches/ patches/error-format-security.patch patches/fix-binutils-gold.patch rules

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Sep 28 21:03:34 2012
New Revision: 35839

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35839
Log:
Integrate changes from the two NMUs. Thanks guys!

Added:
    attic/dasher/debian/patches/
    attic/dasher/debian/patches/error-format-security.patch
    attic/dasher/debian/patches/fix-binutils-gold.patch
Modified:
    attic/dasher/debian/changelog
    attic/dasher/debian/rules

Modified: attic/dasher/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/dasher/debian/changelog?rev=35839&op=diff
==============================================================================
--- attic/dasher/debian/changelog [utf-8] (original)
+++ attic/dasher/debian/changelog [utf-8] Fri Sep 28 21:03:34 2012
@@ -1,11 +1,32 @@
-dasher (4.11-2) unstable; urgency=low
-
-  * Use source:Version instead of gnome:Version
+dasher (4.11-2) UNRELEASED; urgency=low
+
   * Update repository URL.
   * Replace at-spi dependency with libatk-adaptor.
-  * Remove simple-patchsys, we have no patches anyway.
-
- -- Josselin Mouette <joss at debian.org>  Fri, 28 Sep 2012 22:51:21 +0200
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 31 Dec 2011 11:20:15 +0100
+
+dasher (4.11-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use source:Version instead of gnome:Version.
+    Make the package binNMU safe. (Closes: #629307)
+
+ -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 07 Jul 2012 18:00:29 +0200
+
+dasher (4.11-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: game_mode_helper.cpp:327:15: error: format not a string
+    literal and no format arguments [-Werror=format-security]":
+    add patch error-format-security.patch from Eric Alexander: add a format
+    argument in Src/Gtk2/game_mode_helper.cpp.
+    (Closes: #643371)
+  * Fix "ftbfs with gold or ld --no-add-needed":
+    add patch fix-binutils-gold.patch from Mònica Ramírez Arceda: force
+    linking against X11.
+    (Closes: #615705)
+
+ -- gregor herrmann <gregoa at debian.org>  Sun, 04 Dec 2011 17:04:06 +0100
 
 dasher (4.11-1) unstable; urgency=low
 

Added: attic/dasher/debian/patches/error-format-security.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/dasher/debian/patches/error-format-security.patch?rev=35839&op=file
==============================================================================
--- attic/dasher/debian/patches/error-format-security.patch (added)
+++ attic/dasher/debian/patches/error-format-security.patch [utf-8] Fri Sep 28 21:03:34 2012
@@ -1,0 +1,12 @@
+Index: dasher-4.11/Src/Gtk2/game_mode_helper.cpp
+===================================================================
+--- dasher-4.11.orig/Src/Gtk2/game_mode_helper.cpp	2009-12-18 13:40:29.000000000 -0500
++++ dasher-4.11/Src/Gtk2/game_mode_helper.cpp	2011-11-11 12:33:12.349741593 -0500
+@@ -324,6 +324,7 @@
+ 				   GTK_DIALOG_MODAL,
+ 				   GTK_MESSAGE_INFO,
+ 				   GTK_BUTTONS_OK,
++                                   "%s",
+ 				   message);
+   gtk_dialog_run (GTK_DIALOG (pDialog));
+   gtk_widget_destroy (pDialog);

Added: attic/dasher/debian/patches/fix-binutils-gold.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/dasher/debian/patches/fix-binutils-gold.patch?rev=35839&op=file
==============================================================================
--- attic/dasher/debian/patches/fix-binutils-gold.patch (added)
+++ attic/dasher/debian/patches/fix-binutils-gold.patch [utf-8] Fri Sep 28 21:03:34 2012
@@ -1,0 +1,28 @@
+Description: Fix build failures with binutils-gold.
+Author: Mònica Ramírez Arceda <monica at probeta.net>
+Las-Update: 2011-07-17
+
+--- a/Src/Makefile.am
++++ b/Src/Makefile.am
+@@ -34,7 +34,8 @@
+ 	$(GTK2BUILD_LIBS) \
+ 	-lexpat \
+ 	$(POPT_LIBS) \
+-	$(GPELIB)
++	$(GPELIB) \
++        -lX11
+ #endif
+ 
+ #if DOQTE
+--- a/Src/Makefile.in
++++ b/Src/Makefile.in
+@@ -295,7 +295,8 @@
+ 	$(GTK2BUILD_LIBS) \
+ 	-lexpat \
+ 	$(POPT_LIBS) \
+-	$(GPELIB)
++	$(GPELIB) \
++        -lX11
+ 
+ all: all-recursive
+ 

Modified: attic/dasher/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/dasher/debian/rules?rev=35839&op=diff
==============================================================================
--- attic/dasher/debian/rules [utf-8] (original)
+++ attic/dasher/debian/rules [utf-8] Fri Sep 28 21:03:34 2012
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk