[med-svn] r8860 - in trunk/packages/gdpc/trunk/debian: . patches source

[Andreas Tille]

Author: tille
Date: 2011-12-09 07:46:31 +0000 (Fri, 09 Dec 2011)
New Revision: 8860

Added:
   trunk/packages/gdpc/trunk/debian/patches/30_gdk_enable_deprecated.patch
   trunk/packages/gdpc/trunk/debian/source/
   trunk/packages/gdpc/trunk/debian/source/format
Modified:
   trunk/packages/gdpc/trunk/debian/changelog
   trunk/packages/gdpc/trunk/debian/compat
   trunk/packages/gdpc/trunk/debian/control
   trunk/packages/gdpc/trunk/debian/patches/series
   trunk/packages/gdpc/trunk/debian/rules
Log:
Do not use -DGDK_DISABLE_DEPRECATED (closes #642094) and general packaging updates


Modified: trunk/packages/gdpc/trunk/debian/changelog
===================================================================
--- trunk/packages/gdpc/trunk/debian/changelog	2011-12-09 05:41:40 UTC (rev 8859)
+++ trunk/packages/gdpc/trunk/debian/changelog	2011-12-09 07:46:31 UTC (rev 8860)
@@ -1,3 +1,14 @@
+gdpc (2.2.5-2) unstable; urgency=low
+
+  * Do not use -DGDK_DISABLE_DEPRECATED (Thanks to Colin Watson
+    <cjwatson at ubuntu.com> for the patch)
+    Closes: #642094 (LP: #770768)
+  * Standards-Version: 3.9.2 (no changes needed)
+  * debian/source/format: 3.0 (quilt)
+  * Debhelper 8 (control+compat)
+
+ -- Andreas Tille <tille at debian.org>  Fri, 09 Dec 2011 08:22:35 +0100
+
 gdpc (2.2.5-1) unstable; urgency=low
 
   [ Charles Plessy ]

Modified: trunk/packages/gdpc/trunk/debian/compat
===================================================================
--- trunk/packages/gdpc/trunk/debian/compat	2011-12-09 05:41:40 UTC (rev 8859)
+++ trunk/packages/gdpc/trunk/debian/compat	2011-12-09 07:46:31 UTC (rev 8860)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/gdpc/trunk/debian/control
===================================================================
--- trunk/packages/gdpc/trunk/debian/control	2011-12-09 05:41:40 UTC (rev 8859)
+++ trunk/packages/gdpc/trunk/debian/control	2011-12-09 07:46:31 UTC (rev 8860)
@@ -5,8 +5,8 @@
 DM-Upload-Allowed: yes
 Uploaders: Nelson A. de Oliveira <naoliv at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7.1), libgtk2.0-dev, quilt
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 8), libgtk2.0-dev
+Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gdpc/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/gdpc/trunk/
 Homepage: http://www.frantz.fi/software/gdpc.php

Added: trunk/packages/gdpc/trunk/debian/patches/30_gdk_enable_deprecated.patch
===================================================================
--- trunk/packages/gdpc/trunk/debian/patches/30_gdk_enable_deprecated.patch	                        (rev 0)
+++ trunk/packages/gdpc/trunk/debian/patches/30_gdk_enable_deprecated.patch	2011-12-09 07:46:31 UTC (rev 8860)
@@ -0,0 +1,20 @@
+Description: Drop -DGDK_DISABLE_DEPRECATED
+ gdpc uses GDK drawing functions, and needs to be converted to use Cairo
+ instead.  In the meantime, -DGDK_DISABLE_DEPRECATED unhelpfully breaks
+ prototypes in release builds, so drop it.
+Author: Colin Watson <cjwatson at ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/770768
+Forwarded: no
+Last-Update: 2011-09-19
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ CC = gcc
+-FLAGS=$(CFLAGS) -g -Wall `pkg-config --cflags gtk+-2.0 gthread-2.0` -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
++FLAGS=$(CFLAGS) -g -Wall `pkg-config --cflags gtk+-2.0 gthread-2.0` -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+ LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0`
+ bindir ?= /usr/bin
+ 

Modified: trunk/packages/gdpc/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdpc/trunk/debian/patches/series	2011-12-09 05:41:40 UTC (rev 8859)
+++ trunk/packages/gdpc/trunk/debian/patches/series	2011-12-09 07:46:31 UTC (rev 8860)
@@ -1 +1,2 @@
 20_Makefile_options.patch
+30_gdk_enable_deprecated.patch

Modified: trunk/packages/gdpc/trunk/debian/rules
===================================================================
--- trunk/packages/gdpc/trunk/debian/rules	2011-12-09 05:41:40 UTC (rev 8859)
+++ trunk/packages/gdpc/trunk/debian/rules	2011-12-09 07:46:31 UTC (rev 8860)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt $@
+	dh $@
 
 override_dh_auto_clean:
 	touch gdpc.o gdpc  # ugly hack to let unpatched Makefile work

Added: trunk/packages/gdpc/trunk/debian/source/format
===================================================================
--- trunk/packages/gdpc/trunk/debian/source/format	                        (rev 0)
+++ trunk/packages/gdpc/trunk/debian/source/format	2011-12-09 07:46:31 UTC (rev 8860)
@@ -0,0 +1 @@
+3.0 (quilt)