Control: tag -1 patch
On 2014-01-25 08:50, Eugen Dedu wrote:
> To fix the bug I had to modify an .m4 file. The .m4 file alone is not
> sufficient, I had to modify the configure file too. Because autotools
> programs changed since the time the configure file was generated, I had
> two choices:
> - either I manually patch the configure file with the few lines changed
> by the modification given by the .m4 file
> - or I regenerate the configure, but the patch will be huge.
There is a third solution: use dh_autoreconf and regenerate configure at
compile time
> I used the first method. For an unknown and mysterious reason, for the
> two architectures it failed.
Multiarch libdir detection by autoconf does not work on i386:
host arch is i486-linux-gnu, therefore it searches in
/usr/lib/i486-linux-gnu, but multiarch libdir is /usr/lib/i386-linux-gnu.
ax_boost_base.m4 is not working correctly for Debian/i386 and needs more
patching ...
> Should I use the second solution?
Wouldn't help.
Patch attached.
Andreas
diff -Nru ekiga-4.0.1/debian/changelog ekiga-4.0.1/debian/changelog
--- ekiga-4.0.1/debian/changelog 2014-01-18 13:13:59.000000000 +0100
+++ ekiga-4.0.1/debian/changelog 2014-01-25 14:03:44.000000000 +0100
@@ -1,3 +1,12 @@
+ekiga (4.0.1-3.1) UNRELEASED; urgency=medium
+
+ [ Andreas Beckmann ]
+ * Switch to dh-autoreconf. Enable automake option subdir-objects.
+ * Use explicit --with-boost-libdir since multiarch detection does not work
+ on *-i386 architectures. (Closes: #735791)
+
+ -- Andreas Beckmann <a...@debian.org> Sat, 25 Jan 2014 13:05:16 +0100
+
ekiga (4.0.1-3) unstable; urgency=low
[ Eugen Dedu ]
diff -Nru ekiga-4.0.1/debian/control ekiga-4.0.1/debian/control
--- ekiga-4.0.1/debian/control 2014-01-18 13:51:09.000000000 +0100
+++ ekiga-4.0.1/debian/control 2014-01-25 14:07:25.000000000 +0100
@@ -9,6 +9,7 @@
Maintainer: Kilian Krause <kil...@debian.org>
Uploaders: Eugen Dedu <eugen.d...@pu-pm.univ-fcomte.fr>, Debian GNOME
Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>
Build-Depends: debhelper (>= 9),
+ dh-autoreconf,
libsasl2-dev,
gettext,
libldap2-dev,
@@ -17,7 +18,6 @@
libloudmouth1-dev,
libgconf2-dev,
libxv-dev,
- autotools-dev,
gnome-pkg-tools,
rarian-compat,
intltool,
diff -Nru ekiga-4.0.1/debian/control.in ekiga-4.0.1/debian/control.in
--- ekiga-4.0.1/debian/control.in 2014-01-18 13:04:59.000000000 +0100
+++ ekiga-4.0.1/debian/control.in 2014-01-25 12:35:44.000000000 +0100
@@ -4,6 +4,7 @@
Maintainer: Kilian Krause <kil...@debian.org>
Uploaders: Eugen Dedu <eugen.d...@pu-pm.univ-fcomte.fr>, Debian GNOME
Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org>
Build-Depends: debhelper (>= 9),
+ dh-autoreconf,
libsasl2-dev,
gettext,
libldap2-dev,
@@ -12,7 +13,6 @@
libloudmouth1-dev,
libgconf2-dev,
libxv-dev,
- autotools-dev,
gnome-pkg-tools,
rarian-compat,
intltool,
diff -Nru ekiga-4.0.1/debian/patches/autofoo.patch
ekiga-4.0.1/debian/patches/autofoo.patch
--- ekiga-4.0.1/debian/patches/autofoo.patch 1970-01-01 01:00:00.000000000
+0100
+++ ekiga-4.0.1/debian/patches/autofoo.patch 2014-01-25 13:36:39.000000000
+0100
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,7 +4,7 @@
+ AC_PREREQ([2.53])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR(src/ekiga.cpp)
+-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
++AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
+
+ AM_MAINTAINER_MODE([enable])
+ AC_CONFIG_HEADERS([config.h])
diff -Nru ekiga-4.0.1/debian/patches/boost.patch
ekiga-4.0.1/debian/patches/boost.patch
--- ekiga-4.0.1/debian/patches/boost.patch 2014-01-18 13:49:26.000000000
+0100
+++ ekiga-4.0.1/debian/patches/boost.patch 2014-01-25 13:37:31.000000000
+0100
@@ -29,22 +29,3 @@
dnl first we check the system location for boost libraries
dnl this location ist chosen if boost libraries are installed with the
--layout=system option
---- a/configure 2014-01-18 13:41:38.899750125 +0100
-+++ b/configure 2014-01-18 13:45:41.336952274 +0100
-@@ -17800,9 +17800,14 @@
-
- libsubdirs="lib"
- ax_arch=`uname -m`
-- if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o
$ax_arch = sparc64; then
-+
-+ case $ax_arch in
-+ x86_64|ppc64|s390x|sparc64|aarch64)
- libsubdirs="lib64 lib lib64"
-- fi
-+ ;;
-+ esac
-+
-+ libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
-
- if test "$ac_boost_path" != ""; then
- BOOST_CPPFLAGS="-I$ac_boost_path/include"
diff -Nru ekiga-4.0.1/debian/patches/powerpcspe.patch
ekiga-4.0.1/debian/patches/powerpcspe.patch
--- ekiga-4.0.1/debian/patches/powerpcspe.patch 2014-01-18 13:09:23.000000000
+0100
+++ ekiga-4.0.1/debian/patches/powerpcspe.patch 2014-01-25 13:09:47.000000000
+0100
@@ -1,14 +1,3 @@
---- a/configure.orig 2013-05-10 13:11:17.000000000 +0200
-+++ a/configure 2013-05-10 13:11:47.000000000 +0200
-@@ -16583,7 +16583,7 @@
- gm_platform="solaris"
- ;;
-
-- linux-gnulp | linux-gnu | linux-gnueabi* | linux | Linux)
-+ linux-gnulp | linux-gnu | linux-gnuspe | linux-gnueabi* | linux | Linux)
- gm_platform="linux"
- ;;
-
--- a/configure.ac.orig 2013-05-10 13:11:24.000000000 +0200
+++ a/configure.ac 2013-05-10 13:12:00.000000000 +0200
@@ -90,7 +90,7 @@
diff -Nru ekiga-4.0.1/debian/patches/series ekiga-4.0.1/debian/patches/series
--- ekiga-4.0.1/debian/patches/series 2014-01-18 13:14:31.000000000 +0100
+++ ekiga-4.0.1/debian/patches/series 2014-01-25 13:34:29.000000000 +0100
@@ -1,2 +1,3 @@
powerpcspe.patch
boost.patch
+autofoo.patch
diff -Nru ekiga-4.0.1/debian/rules ekiga-4.0.1/debian/rules
--- ekiga-4.0.1/debian/rules 2013-11-10 14:27:50.000000000 +0100
+++ ekiga-4.0.1/debian/rules 2014-01-25 13:50:43.000000000 +0100
@@ -4,23 +4,17 @@
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
%:
- dh $@ --with autotools_dev --parallel
+ dh $@ --with autoreconf --parallel
override_dh_auto_configure:
dh_auto_configure --\
+ --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--disable-schemas-install \
--disable-scrollkeeper \
--disable-silent-rules \
--enable-avahi \
--enable-loudmouth
-clean::
- dh_testdir
- dh_auto_clean
- -dh_autotools-dev_restoreconfig
- rm -f gnome-doc-utils.make
- dh_clean
-
override_dh_auto_install:
cd po/; intltool-update -p
$(MAKE) install DESTDIR=$(CURDIR)/debian/ekiga
