[Pkg-cli-apps-commits] r5348 - in /packages/gnome-do/trunk/debian: changelog control patches/00list patches/03_disable_docky.dpatch patches/04_dont_disable_deprecated.dpatch rules

laney-guest at users.alioth.debian.org laney-guest at users.alioth.debian.org
Wed Sep 29 17:39:04 UTC 2010 

Author: laney-guest
Date: Wed Sep 29 17:39:00 2010
New Revision: 5348

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5348
Log:
* debian/patches/03_disable_docky.dpatch: Add patch to disable Docky
  theme as this is now distributed as a separate project, in the docky
  package.
* debian/patches/04_dont_disable_deprecated.dpatch: Add patch to not
  build with *DISABLE_DEPRECATED. libdo uses deprecated symbols and
  FTBFS with these flags set. It's wrong to set them in release tarballs
  anyway.
* debian/control, debian/rules: Add dh-autoreconf to autoreconf in the
  build in order to pick up the above patches.

Added:
    packages/gnome-do/trunk/debian/patches/03_disable_docky.dpatch   (with props)
    packages/gnome-do/trunk/debian/patches/04_dont_disable_deprecated.dpatch   (with props)
Modified:
    packages/gnome-do/trunk/debian/changelog
    packages/gnome-do/trunk/debian/control
    packages/gnome-do/trunk/debian/patches/00list
    packages/gnome-do/trunk/debian/rules

Modified: packages/gnome-do/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/changelog?rev=5348&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/changelog (original)
+++ packages/gnome-do/trunk/debian/changelog Wed Sep 29 17:39:00 2010
@@ -1,3 +1,17 @@
+gnome-do (0.8.3.1+dfsg-2) UNRELEASED; urgency=low
+
+  * debian/patches/03_disable_docky.dpatch: Add patch to disable Docky
+    theme as this is now distributed as a separate project, in the docky
+    package.
+  * debian/patches/04_dont_disable_deprecated.dpatch: Add patch to not
+    build with *DISABLE_DEPRECATED. libdo uses deprecated symbols and
+    FTBFS with these flags set. It's wrong to set them in release tarballs
+    anyway.
+  * debian/control, debian/rules: Add dh-autoreconf to autoreconf in the
+    build in order to pick up the above patches.
+
+ -- Iain Lane <laney at ubuntu.com>  Wed, 29 Sep 2010 17:53:43 +0100
+
 gnome-do (0.8.3.1+dfsg-1) unstable; urgency=low
 
   * New upstream bugfix release: (Closes: 561271)

Modified: packages/gnome-do/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/control?rev=5348&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/control (original)
+++ packages/gnome-do/trunk/debian/control Wed Sep 29 17:39:00 2010
@@ -4,13 +4,14 @@
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Christopher James Halse Rogers <raof at ubuntu.com>, Iain Lane <laney at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50), 
+               dh-autoreconf,
                dpatch,
                mono-devel (>= 2.4.2.3),
                intltool,
                autoconf,
                autotools-dev,
                automake,
-	       libtool,
+    	       libtool,
                libndesk-dbus1.0-cil-dev,
                libndesk-dbus-glib1.0-cil-dev,
                libmono-cairo2.0-cil,

Modified: packages/gnome-do/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/patches/00list?rev=5348&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/patches/00list (original)
+++ packages/gnome-do/trunk/debian/patches/00list Wed Sep 29 17:39:00 2010
@@ -2,3 +2,5 @@
 01_fix_libX11_linkage
 02_use_cli_for_wrapper
 10_sk_translation_update
+03_disable_docky.dpatch
+04_dont_disable_deprecated.dpatch

Added: packages/gnome-do/trunk/debian/patches/03_disable_docky.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/patches/03_disable_docky.dpatch?rev=5348&op=file
==============================================================================
--- packages/gnome-do/trunk/debian/patches/03_disable_docky.dpatch (added)
+++ packages/gnome-do/trunk/debian/patches/03_disable_docky.dpatch Wed Sep 29 17:39:00 2010
@@ -1,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Description: Disable Docky theme as this is now distributed as a
+## separate project, in the docky package.
+## Origin/Author: Iain Lane <laney at ubuntu.com>
+## Forwarded: not-needed
+## 03_disable_docky.dpatch by Iain Lane <laney at ubuntu.com>
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gnome-do-0.8.3.1+dfsg~/Makefile.am gnome-do-0.8.3.1+dfsg/Makefile.am
+--- gnome-do-0.8.3.1+dfsg~/Makefile.am	2010-09-29 17:59:34.460896100 +0100
++++ gnome-do-0.8.3.1+dfsg/Makefile.am	2010-09-29 17:59:34.610907709 +0100
+@@ -12,7 +12,6 @@
+ 	Do.Platform.Linux \
+ 	Do.Interface.Linux.AnimationBase \
+ 	Do.Interface.Linux.Classic \
+-	Do.Interface.Linux.Docky \
+ 	Do.Interface.Linux.GlassFrame \
+ 	Do.Interface.Linux.HUD \
+ 	Do.Interface.Linux.Mini \
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gnome-do-0.8.3.1+dfsg~/configure.ac gnome-do-0.8.3.1+dfsg/configure.ac
+--- gnome-do-0.8.3.1+dfsg~/configure.ac	2009-12-09 00:08:56.000000000 +0000
++++ gnome-do-0.8.3.1+dfsg/configure.ac	2010-09-29 17:59:34.610907709 +0100
+@@ -130,8 +130,6 @@
+ Do.Interface.Linux/src/AssemblyInfo.cs
+ Do.Interface.Linux.AnimationBase/Makefile
+ Do.Interface.Linux.Classic/Makefile
+-Do.Interface.Linux.Docky/Makefile
+-Do.Interface.Linux.Docky/AssemblyInfo.cs
+ Do.Interface.Linux.GlassFrame/Makefile
+ Do.Interface.Linux.HUD/Makefile
+ Do.Interface.Linux.Mini/Makefile
+@@ -148,7 +146,6 @@
+ libdo/Makefile
+ Makefile
+ data/Makefile
+-data/Docky.DefaultClockTheme/Makefile
+ data/icons/Makefile
+ data/icons/hicolor/16x16/Makefile
+ data/icons/hicolor/16x16/apps/Makefile
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gnome-do-0.8.3.1+dfsg~/data/Makefile.am gnome-do-0.8.3.1+dfsg/data/Makefile.am
+--- gnome-do-0.8.3.1+dfsg~/data/Makefile.am	2009-06-29 01:19:29.000000000 +0100
++++ gnome-do-0.8.3.1+dfsg/data/Makefile.am	2010-09-29 17:59:47.041869822 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = icons Docky.DefaultClockTheme
++SUBDIRS = icons
+ 
+ EXTRA_DIST = $(schemas_in_files) gnome-do.desktop.in 
+ CLEANFILES = $(schemas_DATA) gnome-do.desktop

Propchange: packages/gnome-do/trunk/debian/patches/03_disable_docky.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/gnome-do/trunk/debian/patches/04_dont_disable_deprecated.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/patches/04_dont_disable_deprecated.dpatch?rev=5348&op=file
==============================================================================
--- packages/gnome-do/trunk/debian/patches/04_dont_disable_deprecated.dpatch (added)
+++ packages/gnome-do/trunk/debian/patches/04_dont_disable_deprecated.dpatch Wed Sep 29 17:39:00 2010
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Description: Do not build with *DISABLE_DEPRECATED. libdo uses
+## deprecated symbols and FTBFS with these flags set. It's wrong to
+## set them in release tarballs anyway.
+## Origin/Author: Iain Lane <laney at ubuntu.com
+## Bug: https://bugs.launchpad.net/do/+bug/647495
+## 04_dont_disable_deprecated.dpatch by Iain Lane <laney at ubuntu.com>
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gnome-do-0.8.3.1+dfsg~/libdo/Makefile.am gnome-do-0.8.3.1+dfsg/libdo/Makefile.am
+--- gnome-do-0.8.3.1+dfsg~/libdo/Makefile.am	2010-09-29 18:04:35.000000000 +0100
++++ gnome-do-0.8.3.1+dfsg/libdo/Makefile.am	2010-09-29 18:05:08.036714881 +0100
+@@ -2,9 +2,6 @@
+ 
+ AM_CFLAGS = -DG_LOG_DOMAIN=\"libdo\"	\
+ 	    -DEGG_COMPILATION 		\
+-	    -DGTK_DISABLE_DEPRECATED 	\
+-	    -DGDK_DISABLE_DEPRECATED 	\
+-	    -DG_DISABLE_DEPRECATED	\
+ 	    $(LIBDO_CFLAGS)
+ 
+ 

Propchange: packages/gnome-do/trunk/debian/patches/04_dont_disable_deprecated.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/gnome-do/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/debian/rules?rev=5348&op=diff
==============================================================================
--- packages/gnome-do/trunk/debian/rules (original)
+++ packages/gnome-do/trunk/debian/rules Wed Sep 29 17:39:00 2010
@@ -20,7 +20,7 @@
 	dh_clean
 
 %:
-	dh $@
+	dh --with autoreconf $@
 
 TEMP_DIR := $(shell mktemp -d)
 MAKEFILE = $(firstword $(MAKEFILE_LIST))

More information about the Pkg-cli-apps-commits mailing list