merging changes done for experimental

This commit is contained in:
Gustavo Noronha
2006-01-07 22:02:23 +00:00
parent 3d9c8d6fe6
commit ab5c85290c
7 changed files with 49 additions and 28 deletions

20
debian/changelog vendored
View File

@@ -1,3 +1,23 @@
libgtop2 (2.12.0-2) experimental; urgency=high
* Bump shlibs to >= 2.12.0 since the #define'd functions of the API are now
real symbols. (Closes: #336736) [debian/rules]
* Add CDBS' utils. [debian/rules]
* Fix license. [debian/copyright]
* Bump up Standards-Version to 3.6.2. [debian/control, debian/control.in]
-- Loic Minier <lool@dooz.org> Tue, 1 Nov 2005 12:44:28 +0100
libgtop2 (2.12.0-1) experimental; urgency=low
* New upstream version.
* debian/patches/02_fix_link.patch:
- fixed with the new version.
* debian/watch:
- updated
-- Sebastien Bacher <seb128@debian.org> Tue, 18 Oct 2005 12:08:17 +0200
libgtop2 (2.10.2-1) unstable; urgency=low
* New upstream version:

4
debian/control vendored
View File

@@ -2,9 +2,9 @@ Source: libgtop2
Section: libs
Priority: optional
Maintainer: Sebastien Bacher <seb128@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perelló Marín <carlos@pemas.net>, Ed Boraas <ed@debian.org>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Marc 'HE' Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Takuo KITAME <kitame@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andreas Rottmann <rotty@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Carlos Perelló Marín <carlos@pemas.net>, Clément Stenac <zorglub@debian.org>, Ed Boraas <ed@debian.org>, Edd Dumbill <ejad@debian.org>, Emil Soleyman-Zomalan <emil@nishra.com>, Guilherme de S. Pastore <guilherme.pastore@terra.com.br>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Joe Drew <drew@debian.org>, Johannes Rohr <jr.debian@rohr.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Loic Minier <lool@dooz.org>, Marc 'HE' Brockschmidt <he@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Takuo KITAME <kitame@debian.org>
Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, xlibs-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo
Standards-Version: 3.6.1.0
Standards-Version: 3.6.2
Package: libgtop2-5
Architecture: any

2
debian/control.in vendored
View File

@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Sebastien Bacher <seb128@debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, xlibs-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo
Standards-Version: 3.6.1.0
Standards-Version: 3.6.2
Package: libgtop2-5
Architecture: any

28
debian/copyright vendored
View File

@@ -5,10 +5,28 @@ then Noel Koethe <noel@debian.org> in December 2001
It was downloaded from ftp://ftp.gnome.org/pub/GNOME/stable/sources/gtop/
Upstream Authors: Radek Doul\xedk <doulik@karlin.mff.cuni.cz>,
Martin Baulig <martin@home-of-linux.org>
Upstream Authors and Copyright Holders:
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:
License:
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
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'.
Released under the terms of the GPL; see
/usr/share/common-licenses/GPL.

View File

@@ -1,18 +0,0 @@
diff -u libgtop2-2.5.2/sysdeps/common/Makefile.in.orig libgtop2-2.5.2/sysdeps/common/Makefile.in
--- libgtop2-2.5.2/sysdeps/common/Makefile.in.orig 2004-03-27 02:53:38.000000000 +0100
+++ libgtop2-2.5.2/sysdeps/common/Makefile.in 2004-03-27 02:54:59.000000000 +0100
@@ -160,12 +160,12 @@
$(inodedb_SRCLIST)
-libgtop_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+libgtop_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -L`pwd`/../../lib/.libs
libgtop_common_2_0_la_LIBADD = $(LIBGTOP_EXTRA_LIBS)
libgtop_suid_common_2_0_la_SOURCES = error.c sysdeps_suid.c
-libgtop_suid_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+libgtop_suid_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -L`pwd`/../../lib/.libs
EXTRA_DIST = inodedb.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

3
debian/rules vendored
View File

@@ -2,9 +2,10 @@
include /usr/share/cdbs/1/rules/debhelper.mk
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
DEB_CONFIGURE_EXTRA_FLAGS := --without-xauth --with-x
DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-5 (>= 2.9.4)'
DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-5 (>= 2.12.0)'

2
debian/watch vendored
View File

@@ -1,4 +1,4 @@
version=2
ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.10/ \
ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.12/ \
libgtop-(.*)\.tar\.gz \
debian uupdate