r12539 - in /desktop/unstable/gtk2-engines/debian: changelog control patches/99_ltmain_as-needed.patch rules
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon Sep 17 20:43:37 UTC 2007
Author: slomo
Date: Mon Sep 17 20:43:37 2007
New Revision: 12539
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12539
Log:
* New upstream release.
* Upload to unstable, drop check-dist include.
* Changes merged from experimental:
+ Stylistic cleanups to the way stuff gets dh_installed in gtk2-engines and
the udeb.
+ Cleanup debian/copyright spacing.
* debian/patches/99_ltmain_as-needed.patch:
+ Added again to get --as-needed back to work.
* Pass -l/usr/lib/libcairo-directfb/lib/ to dh_shlibdeps for the udeb to
ensure libcairo-directfb2 is found.
Added:
desktop/unstable/gtk2-engines/debian/patches/99_ltmain_as-needed.patch
Modified:
desktop/unstable/gtk2-engines/debian/changelog
desktop/unstable/gtk2-engines/debian/control
desktop/unstable/gtk2-engines/debian/rules
Modified: desktop/unstable/gtk2-engines/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk2-engines/debian/changelog?rev=12539&op=diff
==============================================================================
--- desktop/unstable/gtk2-engines/debian/changelog (original)
+++ desktop/unstable/gtk2-engines/debian/changelog Mon Sep 17 20:43:37 2007
@@ -1,30 +1,27 @@
-gtk2-engines (1:2.11.4-1) experimental; urgency=low
-
- * Stylistic cleanups to the way stuff gets dh_installed in gtk2-engines and
- the udeb.
- * New upstream development releases.
- - Drop 99_ltmain_as-needed; fails to apply and not easy to update for me.
-
- -- Loic Minier <lool at dooz.org> Wed, 08 Aug 2007 11:06:04 +0200
-
-gtk2-engines (1:2.11.2-1) experimental; urgency=low
-
- * New upstream development release.
-
- -- Loic Minier <lool at dooz.org> Tue, 19 Jun 2007 11:52:59 +0200
-
-gtk2-engines (1:2.11.1-1) experimental; urgency=low
+gtk2-engines (1:2.12.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Upload to unstable, drop check-dist include.
+ * Changes merged from experimental:
+ [ Loic Minier ]
+ + Stylistic cleanups to the way stuff gets dh_installed in gtk2-engines and
+ the udeb.
+ + Cleanup debian/copyright spacing.
+ * debian/patches/99_ltmain_as-needed.patch:
+ + Added again to get --as-needed back to work.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 17 Sep 2007 22:38:35 +0200
+
+gtk2-engines (1:2.10.2-2) unstable; urgency=high
[ Josselin Mouette ]
* 99_ltmain_as-needed.patch: get --as-needed back to work.
[ Loic Minier ]
- * New upstream release series; these are development releases, use at your
- own risk.
- - Target at experimental; include check-dist.
- * Cleanup debian/copyright spacing.
-
- -- Loic Minier <lool at dooz.org> Fri, 15 Jun 2007 14:29:01 +0200
+ * Pass -l/usr/lib/libcairo-directfb/lib/ to dh_shlibdeps for the udeb to
+ ensure libcairo-directfb2 is found.
+
+ -- Loic Minier <lool at dooz.org> Mon, 16 Jul 2007 00:24:19 +0200
gtk2-engines (1:2.10.2-1) unstable; urgency=low
Modified: desktop/unstable/gtk2-engines/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk2-engines/debian/control?rev=12539&op=diff
==============================================================================
--- desktop/unstable/gtk2-engines/debian/control (original)
+++ desktop/unstable/gtk2-engines/debian/control Mon Sep 17 20:43:37 2007
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Ed Boraas <ed at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 5),
libgtk2.0-dev (>= 2.10.1-1),
Added: desktop/unstable/gtk2-engines/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk2-engines/debian/patches/99_ltmain_as-needed.patch?rev=12539&op=file
==============================================================================
--- desktop/unstable/gtk2-engines/debian/patches/99_ltmain_as-needed.patch (added)
+++ desktop/unstable/gtk2-engines/debian/patches/99_ltmain_as-needed.patch Mon Sep 17 20:43:37 2007
@@ -1,0 +1,32 @@
+Index: nautilus-2.18.1/ltmain.sh
+===================================================================
+--- nautilus-2.18.1.orig/ltmain.sh 2006-07-13 09:12:13.000000000 +0200
++++ nautilus-2.18.1/ltmain.sh 2007-06-06 23:36:38.899175453 +0200
+@@ -1784,6 +1784,11 @@
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ ;;
+
++ -Wl,--as-needed)
++ deplibs="$deplibs $arg"
++ continue
++ ;;
++
+ -Wl,*)
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ arg=
+@@ -2124,6 +2129,15 @@
+ lib=
+ found=no
+ case $deplib in
++ -Wl,--as-needed)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ fi
++ continue
++ ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
Modified: desktop/unstable/gtk2-engines/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk2-engines/debian/rules?rev=12539&op=diff
==============================================================================
--- desktop/unstable/gtk2-engines/debian/rules (original)
+++ desktop/unstable/gtk2-engines/debian/rules Mon Sep 17 20:43:37 2007
@@ -9,7 +9,6 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := gtk-engines
@@ -21,6 +20,9 @@
# don't run dh_makeshlibs (we don't need shlibs for Gtk modules)
DEB_DH_MAKESHLIBS_ARGS_ALL += -n
+
+# Ensure libcairo-directfb2 is found
+DEB_DH_SHLIBDEPS_ARGS_gtk2-engines-udeb += -l/usr/lib/libcairo-directfb/lib/
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,-Bsymbolic -Wl,--as-needed
More information about the pkg-gnome-commits
mailing list