r28923 - in /desktop/experimental/ekiga/debian: changelog control.in patches/ patches/configure.ac_languages_fix.patch patches/series rules
kilian at users.alioth.debian.org
kilian at users.alioth.debian.org
Tue Jul 19 08:33:53 UTC 2011
Author: kilian
Date: Tue Jul 19 08:33:53 2011
New Revision: 28923
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28923
Log:
* Fix broken languages. Requires dh-autoreconf for now.
* Convert debian/rules to debhelper dh style
Added:
desktop/experimental/ekiga/debian/patches/
desktop/experimental/ekiga/debian/patches/configure.ac_languages_fix.patch
desktop/experimental/ekiga/debian/patches/series
Modified:
desktop/experimental/ekiga/debian/changelog
desktop/experimental/ekiga/debian/control.in
desktop/experimental/ekiga/debian/rules
Modified: desktop/experimental/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/changelog?rev=28923&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/changelog [utf-8] (original)
+++ desktop/experimental/ekiga/debian/changelog [utf-8] Tue Jul 19 08:33:53 2011
@@ -1,3 +1,10 @@
+ekiga (3.3.1-2) UNRELEASED; urgency=low
+
+ * Fix broken languages. Requires dh-autoreconf for now.
+ * Convert debian/rules to debhelper dh style
+
+ -- Kilian Krause <kilian at debian.org> Tue, 19 Jul 2011 10:33:30 +0200
+
ekiga (3.3.1-1) experimental; urgency=low
* New upstream release.
Modified: desktop/experimental/ekiga/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/control.in?rev=28923&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/control.in [utf-8] (original)
+++ desktop/experimental/ekiga/debian/control.in [utf-8] Tue Jul 19 08:33:53 2011
@@ -29,6 +29,7 @@
libxext-dev,
libboost-dev,
libboost-signals-dev,
+ dh-autoreconf,
automake,
autoconf
Standards-Version: 3.9.2.0
Added: desktop/experimental/ekiga/debian/patches/configure.ac_languages_fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/patches/configure.ac_languages_fix.patch?rev=28923&op=file
==============================================================================
--- desktop/experimental/ekiga/debian/patches/configure.ac_languages_fix.patch (added)
+++ desktop/experimental/ekiga/debian/patches/configure.ac_languages_fix.patch [utf-8] Tue Jul 19 08:33:53 2011
@@ -1,0 +1,28 @@
+Origin: upstream
+Description: Upstream broke all languages except English in 2bfaf29
+ Fix is ebd9de96878c224145c0b1d7bf21c7151c0563bf
+
+From ebd9de96878c224145c0b1d7bf21c7151c0563bf Mon Sep 17 00:00:00 2001
+From: Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
+Date: Tue, 19 Jul 2011 08:15:52 +0000
+Subject: Fix generation of po translation files
+
+Bug introduced by commit 2bfaf29.
+---
+diff --git a/configure.ac b/configure.ac
+index 63d8685..eefae22 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -770,7 +770,9 @@ AM_CONDITIONAL(DEBUG, test "x$has_debug" = "xyes")
+ dnl #########################################################################
+ dnl Support for internationalization
+ dnl ########################################################################
+-AC_DEFINE(GETTEXT_PACKAGE, "[AC_PACKAGE_NAME]",[fix])
++GETTEXT_PACKAGE=AC_PACKAGE_NAME
++AC_SUBST(GETTEXT_PACKAGE) # needed by gettext in po directory
++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[fix])
+ AM_GLIB_GNU_GETTEXT
+
+
+--
+cgit v0.9
Added: desktop/experimental/ekiga/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/patches/series?rev=28923&op=file
==============================================================================
--- desktop/experimental/ekiga/debian/patches/series (added)
+++ desktop/experimental/ekiga/debian/patches/series [utf-8] Tue Jul 19 08:33:53 2011
@@ -1,0 +1,1 @@
+configure.ac_languages_fix.patch
Modified: desktop/experimental/ekiga/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/rules?rev=28923&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/rules [utf-8] (original)
+++ desktop/experimental/ekiga/debian/rules [utf-8] Tue Jul 19 08:33:53 2011
@@ -1,67 +1,23 @@
#!/usr/bin/make -f
-
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build $(DEB_HOST_GNU_TYPE)
-else
- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-# how to call quilt
-QUILT := QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
+%:
+ dh $@ --with autotools_dev --with autoreconf
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-CXXFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-# --as-needed is relatively risky and should be added with -z defs if possible
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
-confflags += \
- --prefix=/usr \
+override_dh_auto_configure:
+ dh_auto_configure -- --prefix=/usr \
--sysconfdir=/etc \
--disable-schemas-install \
--disable-scrollkeeper
-patch: patch-stamp
-patch-stamp:
- dh_testdir
- # backup the original files to restore them in the clean target
- [ ! -r config.sub ] || cp config.sub config.sub.orig
- [ ! -r config.guess ] || cp config.guess config.guess.orig
- [ ! -r gnome-doc-utils.make ] || cp gnome-doc-utils.make gnome-doc-utils.make.orig
- # install latest version from autotools-dev
- [ ! -r config.sub ] || cp -f /usr/share/misc/config.sub .
- [ ! -r config.guess ] || cp -f /usr/share/misc/config.guess .
- [ ! -r gnome-doc-utils.make ] || cp -f /usr/share/gnome-doc-utils/gnome-doc-utils.make .
- touch $@
-
-build: build-stamp
-build-stamp: patch-stamp
- dh_testdir
- rm -f config.cache
- CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
- ./configure $(confflags)
- $(MAKE) $(MAKEFLAGS)
- touch $@
-
clean::
dh_testdir
- dh_testroot
- [ ! -f Makefile ] || $(MAKE) distclean
- # restore files from backup (before unpatching)
- [ ! -e config.sub.orig ] || mv -f config.sub.orig config.sub
- [ ! -e config.guess.orig ] || mv -f config.guess.orig config.guess
- [ ! -e gnome-doc-utils.make.orig ] || mv -f gnome-doc-utils.make.orig gnome-doc-utils.make
- -$(RM) -f build-stamp patch-stamp
+ dh_auto_clean
dh_clean
install: build
@@ -74,26 +30,7 @@
rm -f $(CURDIR)/debian/ekiga/usr/lib/ekiga/*/*.la
rm -f $(CURDIR)/debian/ekiga/usr/lib/ekiga/*/plugins/*.la
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs -s -Nekiga-dbg
- dh_install -s
- dh_installmenu -s
- dh_installman -s -Nekiga-dbg
- dh_installchangelogs -s -Nekiga-dbg NEWS
- dh_gconf -s
- dh_link -s
- dh_strip -s --dbg-package=ekiga-dbg
- dh_compress -s
- dh_fixperms -s
- dh_installdeb -s
- dh_shlibdeps -s
- dh_gencontrol -s
- dh_md5sums -s
- dh_builddeb -s
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch
+override_dh_installchangelogs:
+ dh_installchangelogs NEWS
+override_dh_strip:
+ dh_strip --dbg-package=ekiga-dbg
More information about the pkg-gnome-commits
mailing list