From 86241cc7d2ecab8d151478effbe4fc2b868d1c2e Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sat, 20 May 2006 18:16:06 +0000 Subject: [PATCH] [ Josselin Mouette ] * New upstream release. + Fix for proc_state.h reference in documentation (closes: #353596). * Bump glib build-dependency. * Standards version is 3.7.2. * New library package name. * Split the translations in a separate package. * Use dpkg-dev 1.13.19 for NMU-safety. * Rework package descriptions. * libgtop2-5.docs: removed, added automatically by cdbs. * libgtop2-5.post*: removed, duplicates dh_makeshlibs. * rules: enable xauth. * libgtop-config.1: removed, unused. -- Josselin Mouette Sat, 20 May 2006 20:12:59 +0200 --- debian/changelog | 19 ++++++++++++++-- debian/control | 46 ++++++++++++++++++++------------------ debian/control.in | 44 +++++++++++++++++++----------------- debian/libgtop-config.1 | 34 ---------------------------- debian/libgtop2-5.docs | 3 --- debian/libgtop2-5.install | 2 -- debian/libgtop2-5.postinst | 8 ------- debian/libgtop2-5.postrm | 8 ------- debian/libgtop2-7.install | 1 + debian/rules | 4 +--- debian/watch | 2 +- 11 files changed, 67 insertions(+), 104 deletions(-) delete mode 100644 debian/libgtop-config.1 delete mode 100644 debian/libgtop2-5.docs delete mode 100644 debian/libgtop2-5.install delete mode 100644 debian/libgtop2-5.postinst delete mode 100644 debian/libgtop2-5.postrm create mode 100644 debian/libgtop2-7.install diff --git a/debian/changelog b/debian/changelog index db68fa60..ff23b646 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,24 @@ -libgtop2 (2.12.2-2) UNRELEASED; urgency=low +libgtop2 (2.14.1-1) unstable; urgency=low + [ Loic Minier ] * Stop shipping *.la files in libgtop2-dev. [debian/libgtop2-dev.install] - -- Loic Minier Sun, 7 May 2006 10:41:43 +0200 + [ Josselin Mouette ] + * New upstream release. + + Fix for proc_state.h reference in documentation (closes: #353596). + * Bump glib build-dependency. + * Standards version is 3.7.2. + * New library package name. + * Split the translations in a separate package. + * Use dpkg-dev 1.13.19 for NMU-safety. + * Rework package descriptions. + * libgtop2-5.docs: removed, added automatically by cdbs. + * libgtop2-5.post*: removed, duplicates dh_makeshlibs. + * rules: enable xauth. + * libgtop-config.1: removed, unused. + + -- Josselin Mouette Sat, 20 May 2006 20:12:59 +0200 libgtop2 (2.12.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 2976be2a..81833675 100644 --- a/debian/control +++ b/debian/control @@ -2,35 +2,37 @@ Source: libgtop2 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Clément Stenac , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Guilherme de S. Pastore , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Ross Burton , Sjoerd Simons , Takuo KITAME -Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo -Standards-Version: 3.6.2 +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Ondřej Surý , Ross Burton , Sjoerd Simons , Takuo KITAME +Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19) +Standards-Version: 3.7.2 -Package: libgtop2-5 +Package: libgtop2-7 Architecture: any Section: libs -Depends: ${shlibs:Depends} -Conflicts: libgtop2, libgtop2-2, libgtop2-4 -Replaces: libgtop2, libgtop2-2, libgtop2-4 -Description: Libraries for gtop system monitoring library (part of Gnome 2) - Gnome is the "GNU Network Object Model Environment" +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. . - It is a project to build a complete, user-friendly desktop based - entirely on free software. - . - This package contains the gtop libraries which read information about - processes and the running systems. + This package contains the shared library. Package: libgtop2-dev Architecture: any Section: libdevel -Depends: libgtop2-5 (= ${Source-Version}), libglib2.0-dev -Description: Dev libraries for gtop system monitoring library (part of Gnome 2) - Gnome is the "GNU Network Object Model Environment" +Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-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. . - It is a project to build a complete, user-friendly desktop based - entirely on free software. + This package contains the static library, development headers, and + documentation. + +Package: libgtop2-common +Architecture: any +Section: libs +Replaces: libgtop2-5, libgtop2-4, libgtop2-2 +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. . - This package contains the include files and static library for the - gtop libraries which read information about processes and the running - systems. + This package contains the translations. diff --git a/debian/control.in b/debian/control.in index fa769f5f..9acdab87 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,34 +3,36 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo -Standards-Version: 3.6.2 +Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, libxau-dev, libglib2.0-dev (>= 2.6.0), gnome-pkg-tools, cdbs, texinfo, dpkg-dev (>= 1.13.19) +Standards-Version: 3.7.2 -Package: libgtop2-5 +Package: libgtop2-7 Architecture: any Section: libs -Depends: ${shlibs:Depends} -Conflicts: libgtop2, libgtop2-2, libgtop2-4 -Replaces: libgtop2, libgtop2-2, libgtop2-4 -Description: Libraries for gtop system monitoring library (part of Gnome 2) - Gnome is the "GNU Network Object Model Environment" +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. . - It is a project to build a complete, user-friendly desktop based - entirely on free software. - . - This package contains the gtop libraries which read information about - processes and the running systems. + This package contains the shared library. Package: libgtop2-dev Architecture: any Section: libdevel -Depends: libgtop2-5 (= ${Source-Version}), libglib2.0-dev -Description: Dev libraries for gtop system monitoring library (part of Gnome 2) - Gnome is the "GNU Network Object Model Environment" +Depends: libgtop2-7 (= ${binary:Version}), libglib2.0-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. . - It is a project to build a complete, user-friendly desktop based - entirely on free software. + This package contains the static library, development headers, and + documentation. + +Package: libgtop2-common +Architecture: any +Section: libs +Replaces: libgtop2-5, libgtop2-4, libgtop2-2 +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. . - This package contains the include files and static library for the - gtop libraries which read information about processes and the running - systems. + This package contains the translations. diff --git a/debian/libgtop-config.1 b/debian/libgtop-config.1 deleted file mode 100644 index b58d9689..00000000 --- a/debian/libgtop-config.1 +++ /dev/null @@ -1,34 +0,0 @@ -.TH GTOP l "15 September 1999" -.SH NAME -\fBlibgtop-config\fP \- libgtop libraries and component information retrieval. -.SH SYNTAX -.B libgtop-config -.RI [ --version ] -.RI [ --config ] -.RI [ --features-def-file ] -.SH DESCRIPTION -.B libgtop-config -is used to retrieve information from installed libraries in the system. - -This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. -.LP -.SH OPTIONS -.TP -.B \-\-version -.PD -Prints the version of libgtop that you're using. -.TP -.B \-\-config -.PD -Prints the location of libgtopConf.sh. -.TP -.B \-\-version -.PD -Prints the location of libgtop-features.def. -.SH BUGS -None known - -.SH AUTHORS -Martin Baulig (martin@home-of-linux.org) -.TP -Josh Sled (jsled@scam.XCF.Berkeley.EDU) diff --git a/debian/libgtop2-5.docs b/debian/libgtop2-5.docs deleted file mode 100644 index 86dfdb8c..00000000 --- a/debian/libgtop2-5.docs +++ /dev/null @@ -1,3 +0,0 @@ -README -NEWS -AUTHORS diff --git a/debian/libgtop2-5.install b/debian/libgtop2-5.install deleted file mode 100644 index 428c0e99..00000000 --- a/debian/libgtop2-5.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/share/locale/* -debian/tmp/usr/lib/*.so.* diff --git a/debian/libgtop2-5.postinst b/debian/libgtop2-5.postinst deleted file mode 100644 index b8309774..00000000 --- a/debian/libgtop2-5.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ "$1" = "configure" ]; then - ldconfig -fi - -#DEBHELPER# - diff --git a/debian/libgtop2-5.postrm b/debian/libgtop2-5.postrm deleted file mode 100644 index ec68a8af..00000000 --- a/debian/libgtop2-5.postrm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ "$1" = "remove" ]; then - ldconfig -fi - -#DEBHELPER# - diff --git a/debian/libgtop2-7.install b/debian/libgtop2-7.install new file mode 100644 index 00000000..79bbe2f0 --- /dev/null +++ b/debian/libgtop2-7.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*.so.* diff --git a/debian/rules b/debian/rules index 49034435..3dca6fd6 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,4 @@ 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 -DEB_CONFIGURE_EXTRA_FLAGS := --without-xauth --with-x - -DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-5 (>= 2.12.0)' +DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-7 (>= 2.14.0)' diff --git a/debian/watch b/debian/watch index 8f7f8fa7..5ff75a7e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=2 -ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.12/ \ +ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.14/ \ libgtop-(.*)\.tar\.gz \ debian uupdate