On Wed, Sep 29, 2010 at 06:46:09PM +0100, Iain Lane wrote:
Hello release team! [...] I've prepared this update in SVN and attached the diff. Will you unblock such a change if it lands in unstable?
Now really attached. Iain
diff -u gnome-do-0.8.3.1+dfsg/debian/control gnome-do-0.8.3.1+dfsg/debian/control
--- gnome-do-0.8.3.1+dfsg/debian/control
+++ gnome-do-0.8.3.1+dfsg/debian/control
@@ -4,13 +4,14 @@
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team@lists.alioth.debian.org>
Uploaders: Christopher James Halse Rogers <raof@ubuntu.com>, Iain Lane <laney@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,
diff -u gnome-do-0.8.3.1+dfsg/debian/changelog gnome-do-0.8.3.1+dfsg/debian/changelog
--- gnome-do-0.8.3.1+dfsg/debian/changelog
+++ gnome-do-0.8.3.1+dfsg/debian/changelog
@@ -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@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)
diff -u gnome-do-0.8.3.1+dfsg/debian/rules gnome-do-0.8.3.1+dfsg/debian/rules
--- gnome-do-0.8.3.1+dfsg/debian/rules
+++ gnome-do-0.8.3.1+dfsg/debian/rules
@@ -20,7 +20,7 @@
dh_clean
%:
- dh $@
+ dh --with autoreconf $@
TEMP_DIR := $(shell mktemp -d)
MAKEFILE = $(firstword $(MAKEFILE_LIST))
diff -u gnome-do-0.8.3.1+dfsg/debian/patches/00list gnome-do-0.8.3.1+dfsg/debian/patches/00list
--- gnome-do-0.8.3.1+dfsg/debian/patches/00list
+++ gnome-do-0.8.3.1+dfsg/debian/patches/00list
@@ -4,0 +5,2 @@
+03_disable_docky.dpatch
+04_dont_disable_deprecated.dpatch
only in patch2:
unchanged:
--- gnome-do-0.8.3.1+dfsg.orig/debian/patches/03_disable_docky.dpatch
+++ gnome-do-0.8.3.1+dfsg/debian/patches/03_disable_docky.dpatch
@@ -0,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@ubuntu.com>
+## Forwarded: not-needed
+## 03_disable_docky.dpatch by Iain Lane <laney@ubuntu.com>
+
+@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
only in patch2:
unchanged:
--- gnome-do-0.8.3.1+dfsg.orig/debian/patches/04_dont_disable_deprecated.dpatch
+++ gnome-do-0.8.3.1+dfsg/debian/patches/04_dont_disable_deprecated.dpatch
@@ -0,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@ubuntu.com
+## Bug: https://bugs.launchpad.net/do/+bug/647495
+## 04_dont_disable_deprecated.dpatch by Iain Lane <laney@ubuntu.com>
+
+@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)
+
+
Attachment:
signature.asc
Description: Digital signature