r28726 - in /packages/unstable/libchamplain/debian: ./ patches/

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Thu Jun 30 16:26:02 UTC 2011 

Author: bigon
Date: Thu Jun 30 16:26:01 2011
New Revision: 28726

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28726
Log:
* debian/patches/99_ltmain_as-needed.patch, debian/rules: Limit unneeded
  runtime dependencies
* debian/control.in, debian/*.install, debian/rules: Transition to multiarch
  policy

Added:
    packages/unstable/libchamplain/debian/patches/
    packages/unstable/libchamplain/debian/patches/99_ltmain_as-needed.patch
    packages/unstable/libchamplain/debian/patches/series
Modified:
    packages/unstable/libchamplain/debian/changelog
    packages/unstable/libchamplain/debian/control
    packages/unstable/libchamplain/debian/control.in
    packages/unstable/libchamplain/debian/gir1.2-champlain-0.10.install
    packages/unstable/libchamplain/debian/gir1.2-gtkchamplain-0.10.install
    packages/unstable/libchamplain/debian/libchamplain-0.10-0.install
    packages/unstable/libchamplain/debian/libchamplain-0.10-dev.install
    packages/unstable/libchamplain/debian/libchamplain-gtk-0.10-0.install
    packages/unstable/libchamplain/debian/libchamplain-gtk-0.10-dev.install
    packages/unstable/libchamplain/debian/rules

Modified: packages/unstable/libchamplain/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libchamplain/debian/changelog?rev=28726&op=diff
==============================================================================
--- packages/unstable/libchamplain/debian/changelog [utf-8] (original)
+++ packages/unstable/libchamplain/debian/changelog [utf-8] Thu Jun 30 16:26:01 2011
@@ -1,3 +1,12 @@
+libchamplain (0.10.0-3) UNRELEASED; urgency=low
+
+  * debian/patches/99_ltmain_as-needed.patch, debian/rules: Limit unneeded
+    runtime dependencies
+  * debian/control.in, debian/*.install, debian/rules: Transition to multiarch
+    policy
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 30 Jun 2011 18:22:12 +0200
+
 libchamplain (0.10.0-2) unstable; urgency=low
 
   * Upload to unstable

Modified: packages/unstable/libchamplain/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libchamplain/debian/control?rev=28726&op=diff
==============================================================================
--- packages/unstable/libchamplain/debian/control [utf-8] (original)
+++ packages/unstable/libchamplain/debian/control [utf-8] Thu Jun 30 16:26:01 2011
@@ -8,8 +8,8 @@
 Priority: optional
 Maintainer: Sjoerd Simons <sjoerd at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>
-Build-Depends: debhelper (>= 7),
-               cdbs (>= 0.4.90~),
+Build-Depends: debhelper (>= 8.1.3~),
+               cdbs (>= 0.4.93~),
                gnome-pkg-tools,
                gtk-doc-tools,
                libgtk-3-dev (>= 2.90),
@@ -34,6 +34,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: C library providing ClutterActor to display maps
  Libchamplain is a C library providing a ClutterActor to
  display maps.
@@ -110,6 +112,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Gtk+ widget to display maps
  Libchamplain-gtk is a C library aimed to provide a Gtk+ widget
  to display rasterized maps and markers.

Modified: packages/unstable/libchamplain/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libchamplain/debian/control.in?rev=28726&op=diff
==============================================================================
--- packages/unstable/libchamplain/debian/control.in [utf-8] (original)
+++ packages/unstable/libchamplain/debian/control.in [utf-8] Thu Jun 30 16:26:01 2011
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Sjoerd Simons <sjoerd at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 7),
-               cdbs (>= 0.4.90~),
+Build-Depends: debhelper (>= 8.1.3~),
+               cdbs (>= 0.4.93~),
                gnome-pkg-tools,
                gtk-doc-tools,
                libgtk-3-dev (>= 2.90),
@@ -29,6 +29,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: C library providing ClutterActor to display maps
  Libchamplain is a C library providing a ClutterActor to
  display maps.
@@ -105,6 +107,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Gtk+ widget to display maps
  Libchamplain-gtk is a C library aimed to provide a Gtk+ widget
  to display rasterized maps and markers.

Modified: packages/unstable/libchamplain/debian/gir1.2-champlain-0.10.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libchamplain/debian/gir1.2-champlain-0.10.install?rev=28726&op=diff
==============================================================================
--- packages/unstable/libchamplain/debian/gir1.2-champlain-0.10.install [utf-8] (original)
+++ packages/unstable/libchamplain/debian/gir1.2-champlain-0.10.install [utf-8] Thu Jun 30 16:26:01 2011
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0/Champlain-0.10.typelib
+usr/lib/*/girepository-1.0/Champlain-0.10.typelib usr/lib/girepository-1.0/

Modified: packages/unstable/libchamplain/debian/gir1.2-gtkchamplain-0.10.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libchamplain/debian/gir1.2-gtkchamplain-0.10.install?rev=28726&op=diff
==============================================================================
--- packages/unstable/libchamplain/debian/gir1.2-gtkchamplain-0.10.install [utf-8] (original)
+++ packages/unstable/libchamplain/debian/gir1.2-gtkchamplain-0.10.install [utf-8] Thu Jun 30 16:26:01 2011
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0/GtkChamplain-0.10.typelib
+usr/lib/*/girepository-1.0/GtkChamplain-0.10.typelib usr/lib/girepository-1.0/

Modified: packages/unstable/libchamplain/debian/libchamplain-0.10-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libchamplain/debian/libchamplain-0.10-0.install?rev=28726&op=diff
==============================================================================
--- packages/unstable/libchamplain/debian/libchamplain-0.10-0.install [utf-8] (original)
+++ packages/unstable/libchamplain/debian/libchamplain-0.10-0.install [utf-8] Thu Jun 30 16:26:01 2011
@@ -1,1 +1,1 @@
-usr/lib/libchamplain-0.10.so.*
+usr/lib/*/libchamplain-0.10.so.*

Modified: packages/unstable/libchamplain/debian/libchamplain-0.10-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libchamplain/debian/libchamplain-0.10-dev.install?rev=28726&op=diff
==============================================================================
--- packages/unstable/libchamplain/debian/libchamplain-0.10-dev.install [utf-8] (original)
+++ packages/unstable/libchamplain/debian/libchamplain-0.10-dev.install [utf-8] Thu Jun 30 16:26:01 2011
@@ -1,6 +1,6 @@
 usr/include/libchamplain-0.10
-usr/lib/libchamplain-0.10.so
-usr/lib/libchamplain-0.10.a
-usr/lib/pkgconfig/champlain-0.10.pc
+usr/lib/*/libchamplain-0.10.so
+usr/lib/*/libchamplain-0.10.a
+usr/lib/*/pkgconfig/champlain-0.10.pc
 usr/share/gir-1.0/Champlain-0.10.gir
 usr/share/vala/vapi/champlain-0.10.*

Modified: packages/unstable/libchamplain/debian/libchamplain-gtk-0.10-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libchamplain/debian/libchamplain-gtk-0.10-0.install?rev=28726&op=diff
==============================================================================
--- packages/unstable/libchamplain/debian/libchamplain-gtk-0.10-0.install [utf-8] (original)
+++ packages/unstable/libchamplain/debian/libchamplain-gtk-0.10-0.install [utf-8] Thu Jun 30 16:26:01 2011
@@ -1,1 +1,1 @@
-usr/lib/libchamplain-gtk-0.10.so.*
+usr/lib/*/libchamplain-gtk-0.10.so.*

Modified: packages/unstable/libchamplain/debian/libchamplain-gtk-0.10-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libchamplain/debian/libchamplain-gtk-0.10-dev.install?rev=28726&op=diff
==============================================================================
--- packages/unstable/libchamplain/debian/libchamplain-gtk-0.10-dev.install [utf-8] (original)
+++ packages/unstable/libchamplain/debian/libchamplain-gtk-0.10-dev.install [utf-8] Thu Jun 30 16:26:01 2011
@@ -1,6 +1,6 @@
 usr/include/libchamplain-gtk-0.10
-usr/lib/libchamplain-gtk-0.10.so
-usr/lib/libchamplain-gtk-0.10.a
-usr/lib/pkgconfig/champlain-gtk-0.10.pc
+usr/lib/*/libchamplain-gtk-0.10.so
+usr/lib/*/libchamplain-gtk-0.10.a
+usr/lib/*/pkgconfig/champlain-gtk-0.10.pc
 usr/share/gir-1.0/GtkChamplain-0.10.gir
 usr/share/vala/vapi/champlain-gtk-0.10.*

Added: packages/unstable/libchamplain/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libchamplain/debian/patches/99_ltmain_as-needed.patch?rev=28726&op=file
==============================================================================
--- packages/unstable/libchamplain/debian/patches/99_ltmain_as-needed.patch (added)
+++ packages/unstable/libchamplain/debian/patches/99_ltmain_as-needed.patch [utf-8] Thu Jun 30 16:26:01 2011
@@ -1,0 +1,32 @@
+Index: libnotify-0.5.0/ltmain.sh
+===================================================================
+--- libnotify-0.5.0.orig/ltmain.sh	2010-06-24 10:01:38.000000000 +0200
++++ libnotify-0.5.0/ltmain.sh	2010-06-29 07:27:27.202952725 +0200
+@@ -4716,6 +4716,11 @@
+ 	arg=$func_stripname_result
+ 	;;
+ 
++      -Wl,--as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;
++
+       -Wl,*)
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -5067,6 +5072,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|-threads)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"

Added: packages/unstable/libchamplain/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libchamplain/debian/patches/series?rev=28726&op=file
==============================================================================
--- packages/unstable/libchamplain/debian/patches/series (added)
+++ packages/unstable/libchamplain/debian/patches/series [utf-8] Thu Jun 30 16:26:01 2011
@@ -1,0 +1,1 @@
+99_ltmain_as-needed.patch

Modified: packages/unstable/libchamplain/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libchamplain/debian/rules?rev=28726&op=diff
==============================================================================
--- packages/unstable/libchamplain/debian/rules [utf-8] (original)
+++ packages/unstable/libchamplain/debian/rules [utf-8] Thu Jun 30 16:26:01 2011
@@ -6,7 +6,12 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc \
+# Ensure at build time that the library has no dependencies on undefined
+# symbols, and speed up loading.
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+DEB_CONFIGURE_EXTRA_FLAGS := --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+                             --enable-gtk-doc \
                              --enable-vala \
                              --enable-introspection

More information about the pkg-gnome-commits mailing list