r14042 - in /desktop/unstable/libgtop2/debian: changelog control control.in patches/01_kfreebsd.patch patches/99_ltmain_as-needed.patch rules
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Sat Jan 5 06:20:23 UTC 2008
Author: slomo
Date: Sat Jan 5 06:20:22 2008
New Revision: 14042
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14042
Log:
* debian/patches/01_kfreebsd.patch,
debian/control.in:
+ Fix FTBFS on GNU/kFreeBSD. Thanks to Petr Salinger for the patch
(Closes: #456936).
* debian/control.in:
+ Update Standards-Version to 3.7.3, no additional changes needed.
* debian/patches/99_ltmain_as-needed.patch,
debian/rules:
+ Link with --as-needed to remove some unnecessary dependencies.
Added:
desktop/unstable/libgtop2/debian/patches/01_kfreebsd.patch
desktop/unstable/libgtop2/debian/patches/99_ltmain_as-needed.patch
Modified:
desktop/unstable/libgtop2/debian/changelog
desktop/unstable/libgtop2/debian/control
desktop/unstable/libgtop2/debian/control.in
desktop/unstable/libgtop2/debian/rules
Modified: desktop/unstable/libgtop2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/changelog?rev=14042&op=diff
==============================================================================
--- desktop/unstable/libgtop2/debian/changelog (original)
+++ desktop/unstable/libgtop2/debian/changelog Sat Jan 5 06:20:22 2008
@@ -1,3 +1,17 @@
+libgtop2 (2.20.0-2) unstable; urgency=low
+
+ * debian/patches/01_kfreebsd.patch,
+ debian/control.in:
+ + Fix FTBFS on GNU/kFreeBSD. Thanks to Petr Salinger for the patch
+ (Closes: #456936).
+ * debian/control.in:
+ + Update Standards-Version to 3.7.3, no additional changes needed.
+ * debian/patches/99_ltmain_as-needed.patch,
+ debian/rules:
+ + Link with --as-needed to remove some unnecessary dependencies.
+
+ -- Sebastian Dröge <slomo at debian.org> Sat, 05 Jan 2008 07:14:55 +0100
+
libgtop2 (2.20.0-1) unstable; urgency=low
* New upstream release, with some API additions.
Modified: desktop/unstable/libgtop2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/control?rev=14042&op=diff
==============================================================================
--- desktop/unstable/libgtop2/debian/control (original)
+++ desktop/unstable/libgtop2/debian/control Sat Jan 5 06:20:22 2008
@@ -13,8 +13,10 @@
texinfo,
dpkg-dev (>= 1.13.19),
libxml-parser-perl,
+ libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
+ libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: libgtop2-7
Architecture: any
Modified: desktop/unstable/libgtop2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/control.in?rev=14042&op=diff
==============================================================================
--- desktop/unstable/libgtop2/debian/control.in (original)
+++ desktop/unstable/libgtop2/debian/control.in Sat Jan 5 06:20:22 2008
@@ -13,8 +13,10 @@
texinfo,
dpkg-dev (>= 1.13.19),
libxml-parser-perl,
+ libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
+ libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: libgtop2-7
Architecture: any
Added: desktop/unstable/libgtop2/debian/patches/01_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/patches/01_kfreebsd.patch?rev=14042&op=file
==============================================================================
--- desktop/unstable/libgtop2/debian/patches/01_kfreebsd.patch (added)
+++ desktop/unstable/libgtop2/debian/patches/01_kfreebsd.patch Sat Jan 5 06:20:22 2008
@@ -1,0 +1,16 @@
+--- libgtop2-2.20.0.orig/sysdeps/freebsd/open.c
++++ libgtop2-2.20.0/sysdeps/freebsd/open.c
+@@ -63,9 +63,11 @@
+ server->machine.euid = geteuid ();
+ server->machine.gid = getgid ();
+ server->machine.egid = getegid ();
+-
++#if defined(__FreeBSD_kernel__)
++ server->os_version_code = __FreeBSD_kernel_version;
++#else
+ server->os_version_code = __FreeBSD_version;
+-
++#endif
+ /* Setup machine-specific data */
+ server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open");
+
Added: desktop/unstable/libgtop2/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/patches/99_ltmain_as-needed.patch?rev=14042&op=file
==============================================================================
--- desktop/unstable/libgtop2/debian/patches/99_ltmain_as-needed.patch (added)
+++ desktop/unstable/libgtop2/debian/patches/99_ltmain_as-needed.patch Sat Jan 5 06:20:22 2008
@@ -1,0 +1,30 @@
+--- ltmain.sh.old 2007-10-09 07:38:25.000000000 +0200
++++ ltmain.sh 2007-10-09 07:39:25.000000000 +0200
+@@ -1794,6 +1794,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=
+@@ -2137,6 +2142,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"
Modified: desktop/unstable/libgtop2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgtop2/debian/rules?rev=14042&op=diff
==============================================================================
--- desktop/unstable/libgtop2/debian/rules (original)
+++ desktop/unstable/libgtop2/debian/rules Sat Jan 5 06:20:22 2008
@@ -9,6 +9,7 @@
GNOME_MODULE := libgtop
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.20.0)'
ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
More information about the pkg-gnome-commits
mailing list