Package: workrave
Version: 1.10.1-2
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu trusty ubuntu-patch
Dear Maintainer,
For the ppc64el architecture in Ubuntu, since this package uses libtool, a full
autoreconf is necessary instead of just config.{sub,guess} updates with
autotools-dev. This is because we need new libtool macros for ppc64el.
In Ubuntu, the attached patch was applied to achieve the following:
* Use dh-autoreconf to get new libtool macros for ppc64el.
* Disable -Werror to fix FTBFS while autoreconfing.
* Remove gettext macros to make sure libtool is creating po/Makefile.in.in.
Thanks for considering the patch.
Logan Rosen
-- System Information:
Debian Release: jessie/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500,
'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.13.0-5-generic (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru workrave-1.10.1/debian/control workrave-1.10.1/debian/control
--- workrave-1.10.1/debian/control 2013-09-04 17:25:26.000000000 -0400
+++ workrave-1.10.1/debian/control 2014-01-25 22:06:07.000000000 -0500
@@ -4,8 +4,7 @@
Maintainer: Francois Marier <[email protected]>
Uploaders: Jordi Mallach <[email protected]>
Build-Depends: debhelper (>= 9),
-# dh-autoreconf,
- autotools-dev,
+ dh-autoreconf,
docbook-utils,
xmlto,
gobject-introspection (>= 0.6.7),
diff -Nru workrave-1.10.1/debian/patches/disable_Werror.patch workrave-1.10.1/debian/patches/disable_Werror.patch
--- workrave-1.10.1/debian/patches/disable_Werror.patch 1969-12-31 19:00:00.000000000 -0500
+++ workrave-1.10.1/debian/patches/disable_Werror.patch 2014-01-25 02:08:47.000000000 -0500
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,7 +25,7 @@
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADER([config.h])
+
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign silent-rules])
++AM_INIT_AUTOMAKE([-Wall foreign silent-rules])
+ dnl AM_SILENT_RULES([yes])
+
+ GNOME_SHELL_VERSION=3.6.2
diff -Nru workrave-1.10.1/debian/patches/remove_gettext_macros.patch workrave-1.10.1/debian/patches/remove_gettext_macros.patch
--- workrave-1.10.1/debian/patches/remove_gettext_macros.patch 1969-12-31 19:00:00.000000000 -0500
+++ workrave-1.10.1/debian/patches/remove_gettext_macros.patch 2014-01-25 02:15:14.000000000 -0500
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -837,8 +837,6 @@
+ dnl Internationalization
+ dnl
+
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GNU_GETTEXT([external])
+
+ dnl Hack because windows gettext package is SEVERELY broken...
+ if test "x$platform_os_win32" = "xyes"
diff -Nru workrave-1.10.1/debian/patches/series workrave-1.10.1/debian/patches/series
--- workrave-1.10.1/debian/patches/series 2013-09-04 17:25:26.000000000 -0400
+++ workrave-1.10.1/debian/patches/series 2014-01-25 02:14:44.000000000 -0500
@@ -1,3 +1,5 @@
#private_dirs.patch
git_fix_desktop_bugs.patch
gnome_3.8.patch
+disable_Werror.patch
+remove_gettext_macros.patch
diff -Nru workrave-1.10.1/debian/rules workrave-1.10.1/debian/rules
--- workrave-1.10.1/debian/rules 2013-09-04 17:25:26.000000000 -0400
+++ workrave-1.10.1/debian/rules 2014-01-25 02:04:21.000000000 -0500
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --with autoreconf
override_dh_auto_configure:
dh_auto_configure -- \
