upload to unstable

* Add a new libgtop2-doc package and ship the html documentation on it.
  Also move the info document from the -dev package to the new -doc one.
* debian/watch: Don't uupdate.
* debian/control.in:
  - Standards-Version is 3.8.3, no changes needed.
  - Let libgtop2-7 and libgtop2-common inherit the section from the source
    stanza.
  - Unduplicate some short descriptions.
* debian/copyright: Updated.

debian/changelog

@@ -1,3 +1,61 @@
+libgtop2 (2.28.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add a new libgtop2-doc package and ship the html documentation on it.
+    Also move the info document from the -dev package to the new -doc one.
+  * debian/watch: Don't uupdate.
+  * debian/control.in:
+    - Standards-Version is 3.8.3, no changes needed.
+    - Let libgtop2-7 and libgtop2-common inherit the section from the source
+      stanza.
+    - Unduplicate some short descriptions.
+  * debian/copyright: Updated.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Mon, 21 Sep 2009 23:51:39 +0200
+
+libgtop2 (2.26.1-1) unstable; urgency=low
+
+  [ Luca Bruno ]
+  * New upstream release.
+  * debian/copyright:
+    - Specify GPL version 2.
+    - Don't mention /usr/share/doc/libgtop2*/AUTHORS, all upstream authors
+      are already listed here.
+  * debian/control.in:
+    - Updated Standards-Version to 3.8.1, no additional changes needed.
+    - Add ${misc:Depends} to all packages.
+
+  [ Josselin Mouette ]
+  * Fix incorrect Replaces:.
+  * Remove the FreeBSD-specific libraries from the -dev dependencies, 
+    they are not needed to build libgtop2-based applications.
+  * Add missing build-dependencies.
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 11 Jun 2009 09:15:19 +0200
+
+libgtop2 (2.24.3-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 04 Mar 2009 17:47:56 +0100
+
+libgtop2 (2.24.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump shlibs version to 2.23.2.
+  * Bump intltool requirement to 0.35.0.
+
+ -- Josselin Mouette <joss@debian.org>  Fri, 21 Nov 2008 19:18:22 +0100
+
+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:

debian/control

@@ -2,7 +2,7 @@ Source: libgtop2
 Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
 Build-Depends: debhelper (>= 5),
                gettext,
                pkg-config,
@@ -12,18 +12,19 @@ Build-Depends: debhelper (>= 5),
                cdbs,
                texinfo,
                dpkg-dev (>= 1.13.19),
-               libxml-parser-perl,
+               intltool (>= 0.35.0),
+               libxt-dev,
                libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
                libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
-               libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
-Standards-Version: 3.7.3
+               libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
+               gtk-doc-tools (>= 1.4)
+Standards-Version: 3.8.3
 
 Package: libgtop2-7
 Architecture: any
-Section: libs
-Depends: ${shlibs:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends},
          libgtop2-common (>= ${source:Version})
-Description: gtop system monitoring library
+Description: gtop system monitoring library (shared)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
  .
@@ -32,25 +33,35 @@ Description: gtop system monitoring library
 Package: libgtop2-dev
 Architecture: any
 Section: libdevel
-Depends: libgtop2-7 (= ${binary:Version}),
-         libglib2.0-dev,
-         ${os-specific-dev}
-Description: gtop system monitoring library
+Depends: ${misc:Depends},
+         libgtop2-7 (= ${binary:Version}),
+         libglib2.0-dev
+Description: gtop system monitoring library (devel)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
  .
- This package contains the static library, development headers, and
- documentation.
+ This package contains the static library and development headers.
 
 Package: libgtop2-common
 Architecture: all
-Section: libs
+Depends: ${misc:Depends},
 Replaces: libgtop2-5,
           libgtop2-4,
           libgtop2-2,
           libgtop2
-Description: common files for the gtop system monitoring library
+Description: gtop system monitoring library (common)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
  .
  This package contains the translations.
+
+Package: libgtop2-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends},
+Replaces: libgtop2-dev (<< 2.28.0-1)
+Description: gtop system monitoring library (documentation)
+ The gtop library reads information about processes and the state of the
+ system. It is used by the GNOME desktop environment.
+ .
+ This package contains the documentation.

debian/control.in

@@ -12,18 +12,19 @@ Build-Depends: debhelper (>= 5),
                cdbs,
                texinfo,
                dpkg-dev (>= 1.13.19),
-               libxml-parser-perl,
+               intltool (>= 0.35.0),
+               libxt-dev,
                libgeom-dev [kfreebsd-i386 kfreebsd-amd64],
                libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
-               libkvm-dev [kfreebsd-i386 kfreebsd-amd64]
-Standards-Version: 3.7.3
+               libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
+               gtk-doc-tools (>= 1.4)
+Standards-Version: 3.8.3
 
 Package: libgtop2-7
 Architecture: any
-Section: libs
-Depends: ${shlibs:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends},
          libgtop2-common (>= ${source:Version})
-Description: gtop system monitoring library
+Description: gtop system monitoring library (shared)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
  .
@@ -32,25 +33,35 @@ Description: gtop system monitoring library
 Package: libgtop2-dev
 Architecture: any
 Section: libdevel
-Depends: libgtop2-7 (= ${binary:Version}),
-         libglib2.0-dev,
-         ${os-specific-dev}
-Description: gtop system monitoring library
+Depends: ${misc:Depends},
+         libgtop2-7 (= ${binary:Version}),
+         libglib2.0-dev
+Description: gtop system monitoring library (devel)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
  .
- This package contains the static library, development headers, and
- documentation.
+ This package contains the static library and development headers.
 
 Package: libgtop2-common
 Architecture: all
-Section: libs
+Depends: ${misc:Depends},
 Replaces: libgtop2-5,
           libgtop2-4,
           libgtop2-2,
           libgtop2
-Description: common files for the gtop system monitoring library
+Description: gtop system monitoring library (common)
  The gtop library reads information about processes and the state of the
  system. It is used by the GNOME desktop environment.
  .
  This package contains the translations.
+
+Package: libgtop2-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends},
+Replaces: libgtop2-dev (<< 2.28.0-1)
+Description: gtop system monitoring library (documentation)
+ The gtop library reads information about processes and the state of the
+ system. It is used by the GNOME desktop environment.
+ .
+ This package contains the documentation.

debian/copyright

@@ -5,11 +5,20 @@ then Noel Koethe <noel@debian.org> in December 2001
 
 It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libgtop/
 
-Upstream Authors and Copyright Holders:
+Upstream Authors:
         Martin Baulig (martin@home-of-linux.org)
         Drazen Kacar (dave@srce.hr)
         Benoît Dejean (tazforever@dlfp.org)
-(The full list is in /usr/share/doc/libgtop2*/AUTHORS.)
+
+Copyright:
+1998-99 Martin Baulig
+2004 Nicolás Lichtmaier
+2007 Joe Marcus Clarke
+1996 Charles Blake <cblake@bbn.com>
+1998 Joshua Sled
+1999 Drazen Kacar
+1998-2007 Benoît Dejean
+2006-2007 Henry Zhang
 
 License:
 
@@ -28,5 +37,38 @@ License:
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
+
+misc/i4b_acct.h is licensed under the following terms:
+
+   Copyright (c) 1997 Joerg Wunsch. All rights reserved.
+
+   Copyright (c) 1997, 1998 Hellmuth Michaelis. All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+   3. Neither the name of the author nor the names of any co-contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+   4. Altered versions must be plainly marked as such, and must not be
+      misrepresented as being the original software and/or documentation.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.

debian/libgtop2-doc.doc-base

@@ -0,0 +1,11 @@
+Document: libgtop2
+Title: libsoup Reference Manual
+Author: Martin Baulig, Germán Póo-Caamaño
+Abstract: This manual documents the interfaces of the libgtop
+ library and has some short notes to help get you up to speed
+ with using the library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/gtk-doc/html/libgtop/index.html
+Files: /usr/share/gtk-doc/html/libgtop/*html

debian/libgtop2-doc.install

@@ -0,0 +1 @@
+debian/tmp/usr/share/gtk-doc

debian/rules

@@ -10,9 +10,4 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 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))
-DEB_DH_GENCONTROL_ARGS += -- -Vos-specific-dev="libkvm-dev, libgeom-dev, libdevstat-dev"
-endif
-
+DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libgtop2-7 (>= 2.23.2)'

debian/watch

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