r36853 - in /attic/libbonoboui/debian: changelog control control.in patches/01_dont_check_for_pangox.patch rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Mar 2 22:01:05 UTC 2013
Author: joss
Date: Sat Mar 2 22:01:04 2013
New Revision: 36853
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36853
Log:
* New upstream translation & bugfix release.
* Move to 3.0 quilt format, using tar.bz2 tarball.
* Use dh_autoreconf.
* 01_dont_check_for_pangox.patch. Stop using pangox entirely for
irrelevant checks. Explicitly depend on X11 libraries since
libbonoboui uses them regardless.
Modified:
attic/libbonoboui/debian/changelog
attic/libbonoboui/debian/control
attic/libbonoboui/debian/control.in
attic/libbonoboui/debian/patches/01_dont_check_for_pangox.patch
attic/libbonoboui/debian/rules
Modified: attic/libbonoboui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/changelog?rev=36853&op=diff
==============================================================================
--- attic/libbonoboui/debian/changelog [utf-8] (original)
+++ attic/libbonoboui/debian/changelog [utf-8] Sat Mar 2 22:01:04 2013
@@ -1,4 +1,4 @@
-libbonoboui (2.24.3-2) UNRELEASED; urgency=low
+libbonoboui (2.24.5-1) UNRELEASED; urgency=low
[ Josselin Mouette ]
* Move documentation to libbonoboui2-dev. Closes: #583121.
@@ -15,6 +15,14 @@
* debian/patches/01_dont_check_for_pangox.patch:
+ Stop checking for pangox during configure. It's not needed
and pangox is going away. Closes: #702008.
+
+ [ Josselin Mouette ]
+ * New upstream translation & bugfix release.
+ * Move to 3.0 quilt format, using tar.bz2 tarball.
+ * Use dh_autoreconf.
+ * 01_dont_check_for_pangox.patch. Stop using pangox entirely for
+ irrelevant checks. Explicitly depend on X11 libraries since
+ libbonoboui uses them regardless.
-- Josselin Mouette <joss at debian.org> Sun, 31 Oct 2010 14:42:06 +0100
Modified: attic/libbonoboui/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/control?rev=36853&op=diff
==============================================================================
--- attic/libbonoboui/debian/control [utf-8] (original)
+++ attic/libbonoboui/debian/control [utf-8] Sat Mar 2 22:01:04 2013
@@ -10,6 +10,7 @@
Uploaders: David Weinehall <tao at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
cdbs,
+ dh-autoreconf,
gnome-pkg-tools (>= 0.10),
dpkg-dev (>= 1.13.19),
x11-xserver-utils,
Modified: attic/libbonoboui/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/control.in?rev=36853&op=diff
==============================================================================
--- attic/libbonoboui/debian/control.in [utf-8] (original)
+++ attic/libbonoboui/debian/control.in [utf-8] Sat Mar 2 22:01:04 2013
@@ -5,6 +5,7 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5),
cdbs,
+ dh-autoreconf,
gnome-pkg-tools (>= 0.10),
dpkg-dev (>= 1.13.19),
x11-xserver-utils,
Modified: attic/libbonoboui/debian/patches/01_dont_check_for_pangox.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/patches/01_dont_check_for_pangox.patch?rev=36853&op=diff
==============================================================================
--- attic/libbonoboui/debian/patches/01_dont_check_for_pangox.patch [utf-8] (original)
+++ attic/libbonoboui/debian/patches/01_dont_check_for_pangox.patch [utf-8] Sat Mar 2 22:01:04 2013
@@ -1,30 +1,41 @@
---- a/configure
-+++ b/configure
-@@ -15025,11 +15025,7 @@
- # but if they were omitted to avoid binary compatibility problems
- # then we need to repeat the checks.
- #
+Index: libbonoboui-2.24.5/configure.in
+===================================================================
+--- libbonoboui-2.24.5.orig/configure.in 2011-04-04 14:28:40.000000000 +0200
++++ libbonoboui-2.24.5/configure.in 2013-03-02 22:49:54.595797025 +0100
+@@ -63,27 +63,8 @@ fi
+ gtk_target="`$PKG_CONFIG --variable=target gtk+-2.0`"
+
+ if test $gtk_target = x11 ; then
+- dnl X development libraries check
++ dnl X development libraries check
+
+- #
+- # If Pango included the shared library dependencies from X11 in
+- # the pkg-config output, then we use that (to avoid duplicates).
+- # but if they were omitted to avoid binary compatibility problems
+- # then we need to repeat the checks.
+- #
- if $PKG_CONFIG --exists pangoxft ; then
- PANGO_PACKAGES="pangox pangoxft"
- else
- PANGO_PACKAGES="pangox"
- fi
-+ PANGO_PACKAGES="pangoxft"
+-
+- x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
+- case x_libs in
+- *-lX11*) pango_omitted_x_deps=no ;;
+- *) pango_omitted_x_deps=yes ;;
+- esac
+-
+- if test $pango_omitted_x_deps = yes ; then
+ AC_PATH_XTRA
- x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
- case x_libs in
---- a/configure.in
-+++ b/configure.in
-@@ -71,11 +71,7 @@
- # but if they were omitted to avoid binary compatibility problems
- # then we need to repeat the checks.
- #
-- if $PKG_CONFIG --exists pangoxft ; then
-- PANGO_PACKAGES="pangox pangoxft"
-- else
-- PANGO_PACKAGES="pangox"
+ if test x$no_x = xyes ; then
+@@ -91,7 +72,6 @@ if test $gtk_target = x11 ; then
+ else
+ X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+ fi
- fi
-+ PANGO_PACKAGES="pangoxft"
+ fi
- x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
- case x_libs in
+ AC_SUBST(X_LIBS)
Modified: attic/libbonoboui/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonoboui/debian/rules?rev=36853&op=diff
==============================================================================
--- attic/libbonoboui/debian/rules [utf-8] (original)
+++ attic/libbonoboui/debian/rules [utf-8] Sat Mar 2 22:01:04 2013
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
+TARBALL_EXT := tar.bz2
+
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
More information about the pkg-gnome-commits
mailing list