Branch libgtop2 to experimental

debian/changelog

@@ -1,8 +1,99 @@
+libgtop2 (2.22.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * debian/control.in:
+    + Updated Standards-Version to 3.8.0, no additional changes needed.
+    + Build depend on intltool as it's now required.
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 01 Jul 2008 10:11:55 +0200
+
+libgtop2 (2.22.2-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + Fixes parsing of large /proc/stat on Linux.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sun, 25 May 2008 17:00:32 +0200
+
+libgtop2 (2.22.1-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + Fixes build on non-Linux archs (Closes: #473211).
+  * debian/rules,
+    debian/control.in:
+    + Patch by Petr Salinger to let the -dev package depend on all required
+      packages on GNU/kFreeBSD.
+
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 04 Apr 2008 21:08:49 +0200
+
+libgtop2 (2.22.0-1) unstable; urgency=low
+
+  * New upstream stable release.
+
+ -- Sebastian Dröge <slomo@debian.org>  Fri, 14 Mar 2008 11:55:57 +0100
+
+libgtop2 (2.20.2-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + Fixes smaps parsing with Linux kernel >= 2.6.24.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sat, 08 Mar 2008 05:02:09 +0100
+
+libgtop2 (2.20.1-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Sebastian Dröge <slomo@debian.org>  Tue, 08 Jan 2008 14:07:50 +0100
+
+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@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.
+  * debian/control.in:
+    + Remove libpopt-dev from build-depends.
+  * debian/rules:
+    + Bump shlibs to >= 2.20.0.
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 17 Sep 2007 06:21:20 +0200
+
+libgtop2 (2.14.9-1) unstable; urgency=low
+
+  * New upstream stable release, with some API and ABI removals of
+    glibtop_init_*() functions which shouldn't have been public and are not
+    known to be used by anything else.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 20 Jun 2007 15:16:55 +0200
+
+libgtop2 (2.14.8-2) unstable; urgency=low
+
+  * Upload to unstable; drop check-dist include.
+  * Add CVE id, GNOME bug id, and SVN rev to 2.14.8-1.
+  * Bump up Debhelper compatibility level to 5; fix bogus /usr/include/gnome
+    in libgtop2-dev.install.
+  * Update watch file to track all stable branches and use HTTP.
+  * Drop useless debian/libgtop-dev.postinst; cleanups.
+  * Wrap build-deps and deps.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 11 Apr 2007 16:13:37 +0200
+
 libgtop2 (2.14.8-1) experimental; urgency=low
 
   * Include the new check-dist Makefile to prevent accidental uploads to
     unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
   * New upstream stable releases.
+    - 2.14.7 fixed CVE-2007-0235; GNOME #396477; SVN r2546.
 
  -- Loic Minier <lool@dooz.org>  Sun, 11 Mar 2007 17:05:45 +0100
 

debian/compat

@@ -1 +1 @@
-4
+5

debian/control

@@ -2,14 +2,27 @@ Source: libgtop2
 Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Clément Stenac <zorglub@debian.org>, Dafydd Harries <daf@debian.org>, Guilherme de S. Pastore <gpastore@debian.org>, Gustavo Franco <stratus@debian.org>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Kilian Krause <kilian@debian.org>, Loic Minier <lool@dooz.org>, Marc 'HE' Brockschmidt <he@debian.org>, Marco Cabizza <marco87@gmail.com>, Oystein Gisnas <oystein@gisnas.net>, Ondřej Surý <ondrej@debian.org>, Ross Burton <ross@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
-Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
+Build-Depends: debhelper (>= 5),
-Standards-Version: 3.7.2
+               gettext,
+               pkg-config,
+               libxau-dev,
+               libglib2.0-dev (>= 2.6.0),
+               gnome-pkg-tools (>= 0.10),
+               cdbs,
+               texinfo,
+               dpkg-dev (>= 1.13.19),
+               intltool,
+               libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
+               libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
+               libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
+Standards-Version: 3.8.0
 
 Package: libgtop2-7
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, libgtop2-common (>= ${source:Version})
+Depends: ${shlibs:Depends},
+         libgtop2-common (>= ${source:Version})
 Description: gtop system monitoring library
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -19,7 +32,9 @@ Description: gtop system monitoring library
 Package: libgtop2-dev
 Architecture: any
 Section: libdevel
-Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-dev, ${libkvm-dev}
+Depends: libgtop2-7 (= ${binary:Version}),
+         libglib2.0-dev,
+         ${os-specific-dev}
 Description: gtop system monitoring library
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -30,7 +45,10 @@ Description: gtop system monitoring library
 Package: libgtop2-common
 Architecture: all
 Section: libs
-Replaces: libgtop2-5, libgtop2-4, libgtop2-2, libgtop2
+Replaces: libgtop2-5,
+          libgtop2-4,
+          libgtop2-2,
+          libgtop2
 Description: common files for the gtop system monitoring library
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.

debian/control.in

@@ -3,13 +3,26 @@ Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128@debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools (>= 0.10), cdbs, texinfo, dpkg-dev (>= 1.13.19), libxml-parser-perl, libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
+Build-Depends: debhelper (>= 5),
-Standards-Version: 3.7.2
+               gettext,
+               pkg-config,
+               libxau-dev,
+               libglib2.0-dev (>= 2.6.0),
+               gnome-pkg-tools (>= 0.10),
+               cdbs,
+               texinfo,
+               dpkg-dev (>= 1.13.19),
+               intltool,
+               libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
+               libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
+               libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
+Standards-Version: 3.8.0
 
 Package: libgtop2-7
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, libgtop2-common (>= ${source:Version})
+Depends: ${shlibs:Depends},
+         libgtop2-common (>= ${source:Version})
 Description: gtop system monitoring library
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -19,7 +32,9 @@ Description: gtop system monitoring library
 Package: libgtop2-dev
 Architecture: any
 Section: libdevel
-Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-dev, ${libkvm-dev}
+Depends: libgtop2-7 (= ${binary:Version}),
+         libglib2.0-dev,
+         ${os-specific-dev}
 Description: gtop system monitoring library
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
@@ -30,7 +45,10 @@ Description: gtop system monitoring library
 Package: libgtop2-common
 Architecture: all
 Section: libs
-Replaces: libgtop2-5, libgtop2-4, libgtop2-2, libgtop2
+Replaces: libgtop2-5,
+          libgtop2-4,
+          libgtop2-2,
+          libgtop2
 Description: common files for the gtop system monitoring library
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.

debian/libgtop2-dev.install

@@ -1,5 +1,4 @@
-debian/tmp/usr/include/libgtop-2.0/*
+debian/tmp/usr/include/libgtop-2.0
 debian/tmp/usr/lib/libgtop-2.0.a
 debian/tmp/usr/lib/libgtop-2.0.so
-debian/tmp/usr/include/gnome/*
+debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/pkgconfig/*

debian/patches/99_ltmain_as-needed.patch

@@ -0,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"

debian/rules

@@ -5,14 +5,14 @@ include /usr/share/cdbs/1/rules/simple-patchsys.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
-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 := libgtop
 
-DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-7 (>= 2.14.2)'
+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))
-DEB_DH_GENCONTROL_ARGS = -- -Vlibkvm-dev=libkvm-dev
+DEB_DH_GENCONTROL_ARGS += -- -Vos-specific-dev="libkvm-dev, libgeom-dev, libdevstat-dev"
 endif
 

debian/watch

@@ -1,4 +1,4 @@
 version=2
-ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.14/ \
+http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+)[02468]/ \
 	libgtop-(.*)\.tar\.gz \
 	debian uupdate