diff -Nru gtetrinet-0.7.11/debian/changelog gtetrinet-0.7.11/debian/changelog --- gtetrinet-0.7.11/debian/changelog 2011-10-17 12:02:32.000000000 +0000 +++ gtetrinet-0.7.11/debian/changelog 2011-09-28 21:56:25.000000000 +0000 @@ -1,8 +1,17 @@ -gtetrinet (0.7.11-2build1) maverick; urgency=low +gtetrinet (0.7.11-3) unstable; urgency=low - * No changes upload for libesd-alsa0 -> libesd0 transition + [ Emilio Pozuelo Monfort ] + * debian/patches/desktop_file_encoding.patch: forwarded, add header. - -- Fabrice Coutadeur Tue, 14 Sep 2010 19:34:19 +0200 + [ Jordi Mallach ] + * Switch to source format 3.0 (quilt). Stop using simple-patchsys. + * Bump to debhelper v8. + * debian/patches/werror_format-security.patch: fix build with new dpkg + hardening flags (closes: #643402). + * Bump Standards-Version to 3.9.2, with no changes needed. + * Update watch file, use version 3 and avoid hardcoding version numbers. + + -- Jordi Mallach Wed, 28 Sep 2011 23:56:23 +0200 gtetrinet (0.7.11-2) unstable; urgency=low diff -Nru gtetrinet-0.7.11/debian/compat gtetrinet-0.7.11/debian/compat --- gtetrinet-0.7.11/debian/compat 2011-10-17 12:02:32.000000000 +0000 +++ gtetrinet-0.7.11/debian/compat 2011-09-28 19:43:56.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru gtetrinet-0.7.11/debian/control gtetrinet-0.7.11/debian/control --- gtetrinet-0.7.11/debian/control 2011-10-17 12:02:32.000000000 +0000 +++ gtetrinet-0.7.11/debian/control 2011-09-28 22:08:13.000000000 +0000 @@ -10,14 +10,14 @@ Uploaders: Debian GNOME Maintainers , Loic Minier Build-Depends: autotools-dev, cdbs, - debhelper (>= 7), + debhelper (>= 8), gettext, gnome-pkg-tools, libgnome2-dev (>= 2.0.0), libgnomeui-dev (>= 2.0.0), libgtk2.0-dev (>= 2.6), libxml-parser-perl -Standards-Version: 3.8.1 +Standards-Version: 3.9.2 Homepage: http://gtetrinet.sourceforge.net/ Package: gtetrinet diff -Nru gtetrinet-0.7.11/debian/control.in gtetrinet-0.7.11/debian/control.in --- gtetrinet-0.7.11/debian/control.in 2011-10-17 12:02:32.000000000 +0000 +++ gtetrinet-0.7.11/debian/control.in 2011-09-28 19:48:40.000000000 +0000 @@ -5,14 +5,14 @@ Uploaders: @GNOME_TEAM@ Build-Depends: autotools-dev, cdbs, - debhelper (>= 7), + debhelper (>= 8), gettext, gnome-pkg-tools, libgnome2-dev (>= 2.0.0), libgnomeui-dev (>= 2.0.0), libgtk2.0-dev (>= 2.6), libxml-parser-perl -Standards-Version: 3.8.1 +Standards-Version: 3.9.2 Homepage: http://gtetrinet.sourceforge.net/ Package: gtetrinet diff -Nru gtetrinet-0.7.11/debian/patches/desktop_file_encoding.patch gtetrinet-0.7.11/debian/patches/desktop_file_encoding.patch --- gtetrinet-0.7.11/debian/patches/desktop_file_encoding.patch 2011-10-17 12:02:32.000000000 +0000 +++ gtetrinet-0.7.11/debian/patches/desktop_file_encoding.patch 2010-10-25 18:42:36.000000000 +0000 @@ -1,3 +1,6 @@ +Description: remove deprecated encoding key +Bug: http://bugzilla.gnome.org/show_bug.cgi?id=588202 + --- gtetrinet-0.7.11/gtetrinet.desktop 2009-04-25 16:42:53.000000000 +0200 +++ gtetrinet-0.7.11/gtetrinet.desktop 2009-04-25 16:43:00.000000000 +0200 @@ -1,5 +1,4 @@ diff -Nru gtetrinet-0.7.11/debian/patches/series gtetrinet-0.7.11/debian/patches/series --- gtetrinet-0.7.11/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ gtetrinet-0.7.11/debian/patches/series 2011-09-28 12:27:33.000000000 +0000 @@ -0,0 +1,2 @@ +desktop_file_encoding.patch +werror_format-security.patch diff -Nru gtetrinet-0.7.11/debian/patches/werror_format-security.patch gtetrinet-0.7.11/debian/patches/werror_format-security.patch --- gtetrinet-0.7.11/debian/patches/werror_format-security.patch 1970-01-01 00:00:00.000000000 +0000 +++ gtetrinet-0.7.11/debian/patches/werror_format-security.patch 2011-09-28 12:27:33.000000000 +0000 @@ -0,0 +1,16 @@ +Author: Jordi Mallach +Description: Fix build when using -Werror=format-security, now default + on Debian. +Status: committed-upstream + +--- gtetrinet-0.7.11.orig/src/tetrinet.c ++++ gtetrinet-0.7.11/src/tetrinet.c +@@ -232,7 +232,7 @@ + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, +- buf); ++ "%s", buf); + gtk_dialog_run (GTK_DIALOG(dialog)); + gtk_widget_destroy (dialog); + g_free (data_utf8); diff -Nru gtetrinet-0.7.11/debian/rules gtetrinet-0.7.11/debian/rules --- gtetrinet-0.7.11/debian/rules 2011-10-17 12:02:32.000000000 +0000 +++ gtetrinet-0.7.11/debian/rules 2011-09-28 19:43:56.000000000 +0000 @@ -5,7 +5,6 @@ # Under the public domain. include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk diff -Nru gtetrinet-0.7.11/debian/source/format gtetrinet-0.7.11/debian/source/format --- gtetrinet-0.7.11/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ gtetrinet-0.7.11/debian/source/format 2011-10-17 12:02:32.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru gtetrinet-0.7.11/debian/watch gtetrinet-0.7.11/debian/watch --- gtetrinet-0.7.11/debian/watch 2011-10-17 12:02:32.000000000 +0000 +++ gtetrinet-0.7.11/debian/watch 2011-09-28 21:54:57.000000000 +0000 @@ -1,4 +1,2 @@ -version=2 -ftp://ftp.gnome.org/pub/GNOME/sources/gtetrinet/0.7/ \ - gtetrinet-(.*)\.tar\.gz \ - debian uupdate +version=3 +http://ftp.gnome.org/pub/gnome/sources/gtetrinet/([\d\.]+\d)/gtetrinet-([\d\.]+)\.tar\.bz2