From 525688acd03a978d9e3fbb5606d3df4ebfe15c1b Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Mon, 21 Sep 2009 21:32:53 +0000 Subject: [PATCH] * 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. --- debian/changelog | 15 +++++++ debian/control | 26 +++++++---- debian/control.in | 24 ++++++---- debian/copyright | 45 ++++++++++++++++++- debian/libgtop2-doc.doc-base | 11 +++++ .../{libgtop2-dev.info => libgtop2-doc.info} | 0 debian/libgtop2-doc.install | 1 + debian/watch | 3 +- 8 files changed, 105 insertions(+), 20 deletions(-) create mode 100644 debian/libgtop2-doc.doc-base rename debian/{libgtop2-dev.info => libgtop2-doc.info} (100%) create mode 100644 debian/libgtop2-doc.install diff --git a/debian/changelog b/debian/changelog index f1760b97..0a793d43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +libgtop2 (2.28.0-1) UNRELEASED; 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 Mon, 21 Sep 2009 22:16:28 +0200 + libgtop2 (2.26.1-1) unstable; urgency=low [ Luca Bruno ] diff --git a/debian/control b/debian/control index 78fb46d1..6f2833ed 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: libgtop2 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Josselin Mouette , Sebastian Dröge +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette , Sebastian Dröge Build-Depends: debhelper (>= 5), gettext, pkg-config, @@ -18,14 +18,13 @@ Build-Depends: debhelper (>= 5), libdevstat-dev [kfreebsd-i386 kfreebsd-amd64], libkvm-dev [kfreebsd-i386 kfreebsd-amd64], gtk-doc-tools (>= 1.4) -Standards-Version: 3.8.1 +Standards-Version: 3.8.3 Package: libgtop2-7 Architecture: any -Section: libs 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. . @@ -37,23 +36,32 @@ Section: libdevel Depends: ${misc:Depends}, libgtop2-7 (= ${binary:Version}), libglib2.0-dev -Description: gtop system monitoring library +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. diff --git a/debian/control.in b/debian/control.in index b8bbe918..0dd7e286 100644 --- a/debian/control.in +++ b/debian/control.in @@ -18,14 +18,13 @@ Build-Depends: debhelper (>= 5), libdevstat-dev [kfreebsd-i386 kfreebsd-amd64], libkvm-dev [kfreebsd-i386 kfreebsd-amd64], gtk-doc-tools (>= 1.4) -Standards-Version: 3.8.1 +Standards-Version: 3.8.3 Package: libgtop2-7 Architecture: any -Section: libs 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. . @@ -37,23 +36,32 @@ Section: libdevel Depends: ${misc:Depends}, libgtop2-7 (= ${binary:Version}), libglib2.0-dev -Description: gtop system monitoring library +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. diff --git a/debian/copyright b/debian/copyright index 29f9995d..88d726ec 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,11 +5,21 @@ then Noel Koethe 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) +Copyright: +1998-99 Martin Baulig +2004 Nicolás Lichtmaier +2007 Joe Marcus Clarke +1996 Charles Blake +1998 Joshua Sled +1999 Drazen Kacar +1998-2007 Benoît Dejean +2006-2007 Henry Zhang + License: This package is free software; you can redistribute it and/or modify @@ -29,3 +39,36 @@ License: On Debian systems, the complete text of the GNU General 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. diff --git a/debian/libgtop2-doc.doc-base b/debian/libgtop2-doc.doc-base new file mode 100644 index 00000000..7ad56d1d --- /dev/null +++ b/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 diff --git a/debian/libgtop2-dev.info b/debian/libgtop2-doc.info similarity index 100% rename from debian/libgtop2-dev.info rename to debian/libgtop2-doc.info diff --git a/debian/libgtop2-doc.install b/debian/libgtop2-doc.install new file mode 100644 index 00000000..133e6a2c --- /dev/null +++ b/debian/libgtop2-doc.install @@ -0,0 +1 @@ +debian/tmp/usr/share/gtk-doc diff --git a/debian/watch b/debian/watch index bc8f5233..0608d4e1 100644 --- a/debian/watch +++ b/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