Source: libgksu
Version: 2.0.13~pre1
Severity: normal
Tags: patch
User: debian-de...@lists.debian.org
Usertags: autotools_dev ppc64el
Dear Maintainer,
In Ubuntu, the attached patches were applied to avoid FTBFS on
ppc64el arch.
We have also verified building "libgksu" source package on ppc64el build
machine after applying attached patches.
Thanks for considering the patch.
-Ravindran.
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: ppc64el (ppc64le)
Kernel: Linux 3.13-1-powerpc64le (SMP w/16 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
--===============6721854637079236454==
Content-Type: text/x-diff; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="autoreconf.debpatch"
>From c1ff76b2a148c1f40af9a01a4af3d1ffe501d9ac Mon Sep 17 00:00:00 2001
From: Ravindran Arani <r...@linux.vnet.ibm.com>
Date: Mon, 11 Aug 2014 09:35:22 +0000
Subject: [PATCH] autoreconf
---
debian/control | 2 +-
debian/rules | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 8fed15b..2157a02 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: cdbs,
libstartup-notification0-dev,
libgnome-keyring-dev,
gettext,
- autotools-dev,
+ dh-autoreconf,
gtk-doc-tools,
gnome-pkg-tools (>= 0.10),
libgtop2-dev,
diff --git a/debian/rules b/debian/rules
index d97398e..785d9a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,15 @@ ALLOWED_DISTS += unstable
include /usr/share/cdbs/1/rules/buildcore.mk
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+export AUTOMAKE := automake --foreign
+
DEB_CONFIGURE_EXTRA_FLAGS := --disable-gtk-doc --enable-gnome-keyring
clean::
--
2.1.0.rc1
--===============6721854637079236454==
Content-Type: text/x-diff; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="automake_errors.patch"
Description: Fix various errors with current automake
Author: Colin Watson <cjwat...@ubuntu.com>
--- libgksu-2.0.13~pre1.orig/configure.ac
+++ libgksu-2.0.13~pre1/configure.ac
@@ -40,8 +40,12 @@ AM_CONDITIONAL(USE_VERSION_SCRIPT, test
AC_PATH_PROG(GCONFTOOL, gconftool-2)
AM_GCONF_SOURCE_2
+PKG_CHECK_MODULES(GLIB, [glib-2.0])
+PKG_CHECK_MODULES(GTK, [gtk+-2.0])
PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0,
libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0])
PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.12, gconf-2.0])
+PKG_CHECK_MODULES(LIBGKSUUI, [gtk+-2.0, gconf-2.0, x11])
+PKG_CHECK_MODULES(TEST_GKSUUI, [glib-2.0, x11])
# Checks for library functions.
ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb
nl th zh_CN"
--- libgksu-2.0.13~pre1.orig/libgksu/Makefile.am
+++ libgksu-2.0.13~pre1/libgksu/Makefile.am
@@ -26,15 +26,15 @@ includedir = ${prefix}/include/${PACKAGE
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = libgksu2.pc
-pkglibdir = ${libdir}/${PACKAGE}
-pkglib_PROGRAMS = gksu-run-helper
+pkglibexecdir = ${libdir}/${PACKAGE}
+pkglibexec_PROGRAMS = gksu-run-helper
gksu_run_helper_LDFLAGS =
-gksu_run_helper_LDADD = `pkg-config --libs glib-2.0`
+gksu_run_helper_LDADD = $(GLIB_LIBS)
gksu_run_helper_SOURCES = gksu-run-helper.c
noinst_PROGRAMS = test-gksu
test_gksu_SOURCES = test-gksu.c
-test_gksu_LDADD = libgksu2.la `pkg-config --libs gtk+-2.0`
+test_gksu_LDADD = libgksu2.la $(GTK_LIBS)
test_gksu_LDFLAGS =
EXTRA_DIST = libgksu.ver
--- libgksu-2.0.13~pre1.orig/libgksuui/Makefile.am
+++ libgksu-2.0.13~pre1/libgksuui/Makefile.am
@@ -5,12 +5,12 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/l
noinst_LTLIBRARIES = libgksuui1.0.la
libgksuui1_0_la_SOURCES = gksuui-dialog.c
libgksuui1_0_la_LDFLAGS = -Wl,-O1
-libgksuui1_0_la_LIBADD = `pkg-config --libs gtk+-2.0 gconf-2.0 x11`
+libgksuui1_0_la_LIBADD = $(LIBGKSUUI_LIBS) -lm
noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
includedir = ${prefix}/include/$(PACKAGE)
noinst_PROGRAMS = test-gksuui
test_gksuui_SOURCES = test-gksuui.c
-test_gksuui_LDADD = libgksuui1.0.la `pkg-config --libs glib-2.0 x11`
+test_gksuui_LDADD = libgksuui1.0.la $(TEST_GKSUUI) -lm
test_gksuui_LDFLAGS =
--===============6721854637079236454==--
--
Ravindran
IBM LinuxTechnologyCenter
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
