Package: workrave
Version: 1.10.1-3
Followup-For: Bug #737034
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Revert most of changes from 1.10.1-3 to remedy translation issue.
* Doing a manual libtool update instead to fix FTBFS on ppc64el.
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 2014-01-26 01:12:49.000000000 -0500
+++ workrave-1.10.1/debian/control 2014-01-30 23:04:41.000000000 -0500
@@ -4,7 +4,8 @@
Maintainer: Francois Marier <franc...@debian.org>
Uploaders: Jordi Mallach <jo...@debian.org>
Build-Depends: debhelper (>= 9),
- dh-autoreconf,
+# dh-autoreconf,
+ autotools-dev,
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 2014-01-26 01:12:49.000000000 -0500
+++ workrave-1.10.1/debian/patches/disable_Werror.patch 1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-Author: Logan Rosen <lo...@ubuntu.com>
-Forwarded: no
-Last-Update: 2014-01-25
-Description: Disable -Werror to fix FTBFS while autoreconfing
-
---- 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/libtool_ppc64el.patch workrave-1.10.1/debian/patches/libtool_ppc64el.patch
--- workrave-1.10.1/debian/patches/libtool_ppc64el.patch 1969-12-31 19:00:00.000000000 -0500
+++ workrave-1.10.1/debian/patches/libtool_ppc64el.patch 2014-01-30 22:44:32.000000000 -0500
@@ -0,0 +1,52 @@
+--- a/configure
++++ b/configure
+@@ -9123,7 +9123,10 @@
+ ;;
+ esac
+ ;;
+- ppc64-*linux*|powerpc64-*linux*)
++ powerpc64le-*)
++ LD="${LD-ld} -m elf32lppclinux"
++ ;;
++ powerpc64-*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -9142,7 +9145,10 @@
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- ppc*-*linux*|powerpc*-*linux*)
++ powerpcle-*)
++ LD="${LD-ld} -m elf64lppc"
++ ;;
++ powerpc-*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -1333,7 +1333,10 @@
+ ;;
+ esac
+ ;;
+- ppc64-*linux*|powerpc64-*linux*)
++ powerpc64le-*)
++ LD="${LD-ld} -m elf32lppclinux"
++ ;;
++ powerpc64-*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -1352,7 +1355,10 @@
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+- ppc*-*linux*|powerpc*-*linux*)
++ powerpcle-*)
++ LD="${LD-ld} -m elf64lppc"
++ ;;
++ powerpc-*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
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 2014-01-26 01:12:49.000000000 -0500
+++ workrave-1.10.1/debian/patches/remove_gettext_macros.patch 1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-Author: Logan Rosen <lo...@ubuntu.com>
-Forwarded: no
-Last-Update: 2014-01-25
-Description: Remove gettext macros to make sure libtool is creating po/Makefile.in.in
-
---- 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 2014-01-26 01:12:49.000000000 -0500
+++ workrave-1.10.1/debian/patches/series 2014-01-30 22:43:03.000000000 -0500
@@ -1,5 +1,4 @@
#private_dirs.patch
git_fix_desktop_bugs.patch
gnome_3.8.patch
-disable_Werror.patch
-remove_gettext_macros.patch
+libtool_ppc64el.patch
diff -Nru workrave-1.10.1/debian/rules workrave-1.10.1/debian/rules
--- workrave-1.10.1/debian/rules 2014-01-26 01:12:49.000000000 -0500
+++ workrave-1.10.1/debian/rules 2014-01-30 22:40:41.000000000 -0500
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
%:
- dh $@ --with autoreconf
+ dh $@
override_dh_auto_configure:
dh_auto_configure -- \
