r40441 - in /desktop/unstable/ekiga/debian: changelog control control.in patches/autofoo.patch patches/boost.patch patches/powerpcspe.patch patches/series rules
dedu-guest at users.alioth.debian.org
dedu-guest at users.alioth.debian.org
Mon Jan 27 08:45:07 UTC 2014
Author: dedu-guest
Date: Mon Jan 27 08:45:07 2014
New Revision: 40441
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40441
Log:
Integrate patch to fix bug #735791
Added:
desktop/unstable/ekiga/debian/patches/autofoo.patch
Modified:
desktop/unstable/ekiga/debian/changelog
desktop/unstable/ekiga/debian/control
desktop/unstable/ekiga/debian/control.in
desktop/unstable/ekiga/debian/patches/boost.patch
desktop/unstable/ekiga/debian/patches/powerpcspe.patch
desktop/unstable/ekiga/debian/patches/series
desktop/unstable/ekiga/debian/rules
Modified: desktop/unstable/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/changelog?rev=40441&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/changelog [utf-8] (original)
+++ desktop/unstable/ekiga/debian/changelog [utf-8] Mon Jan 27 08:45:07 2014
@@ -1,6 +1,11 @@
-ekiga (4.0.1-4) UNRELEASED; urgency=low
-
- -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr> Sat, 18 Jan 2014 11:28:19 +0100
+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 <anbe at debian.org> Sat, 25 Jan 2014 13:05:16 +0100
ekiga (4.0.1-3) unstable; urgency=low
Modified: desktop/unstable/ekiga/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/control?rev=40441&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/control [utf-8] (original)
+++ desktop/unstable/ekiga/debian/control [utf-8] Mon Jan 27 08:45:07 2014
@@ -9,6 +9,7 @@
Maintainer: Kilian Krause <kilian at debian.org>
Uploaders: Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>, Debian GNOME Maintainers <pkg-gnome-maintainers at 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,
Modified: desktop/unstable/ekiga/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/control.in?rev=40441&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/control.in [utf-8] (original)
+++ desktop/unstable/ekiga/debian/control.in [utf-8] Mon Jan 27 08:45:07 2014
@@ -4,6 +4,7 @@
Maintainer: Kilian Krause <kilian at debian.org>
Uploaders: Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>, Debian GNOME Maintainers <pkg-gnome-maintainers at 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,
Added: desktop/unstable/ekiga/debian/patches/autofoo.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/autofoo.patch?rev=40441&op=file
==============================================================================
--- desktop/unstable/ekiga/debian/patches/autofoo.patch (added)
+++ desktop/unstable/ekiga/debian/patches/autofoo.patch [utf-8] Mon Jan 27 08:45:07 2014
@@ -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])
Modified: desktop/unstable/ekiga/debian/patches/boost.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/boost.patch?rev=40441&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/patches/boost.patch [utf-8] (original)
+++ desktop/unstable/ekiga/debian/patches/boost.patch [utf-8] Mon Jan 27 08:45:07 2014
@@ -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"
Modified: desktop/unstable/ekiga/debian/patches/powerpcspe.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/powerpcspe.patch?rev=40441&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/patches/powerpcspe.patch [utf-8] (original)
+++ desktop/unstable/ekiga/debian/patches/powerpcspe.patch [utf-8] Mon Jan 27 08:45:07 2014
@@ -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 @@
Modified: desktop/unstable/ekiga/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/series?rev=40441&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/patches/series [utf-8] (original)
+++ desktop/unstable/ekiga/debian/patches/series [utf-8] Mon Jan 27 08:45:07 2014
@@ -1,2 +1,3 @@
powerpcspe.patch
boost.patch
+autofoo.patch
Modified: desktop/unstable/ekiga/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/rules?rev=40441&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/rules [utf-8] (original)
+++ desktop/unstable/ekiga/debian/rules [utf-8] Mon Jan 27 08:45:07 2014
@@ -4,22 +4,16 @@
-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
More information about the pkg-gnome-commits
mailing list