Version 2.5.2-1

* Marc DequÚnes (Duck):
      - New upstream release
      - Corrected patch 'fix_link' to apply on new sources, as it is still
      needed.
      - Deactivated all other patches, they *should* not be useful anymore.

  * Jose Carlos:
      - Converted to cdbs.
      - debian/:
        + Moved .files to .install
      - debian/control.in: 
        + Removed automake and autoconf Build-Dependencies.
        + libgtop2-dev package should depend only on libglib2.0-dev instead
          of libgtk+2.0-dev

debian/changelog

@@ -1,3 +1,22 @@
+libgtop2 (2.5.2-1) experimental; urgency=low
+
+  * Marc Dequènes (Duck):
+      - New upstream release
+      - Corrected patch 'fix_link' to apply on new sources, as it is still
+      needed.
+      - Deactivated all other patches, they *should* not be useful anymore.
+
+  * Jose Carlos:
+      - Converted to cdbs.
+      - debian/:
+        + Moved .files to .install
+      - debian/control.in: 
+        + Removed automake and autoconf Build-Dependencies.
+        + libgtop2-dev package should depend only on libglib2.0-dev instead
+          of libgtk+2.0-dev
+
+ -- Jose Carlos Garcia Sogo <jsogo@debian.org>  Sat, 27 Mar 2004 16:03:56 +0100
+
 libgtop2 (2.0.8-7) unstable; urgency=low
 
   * debian/patches/05_cpu_values.dpatch:

debian/control

@@ -2,8 +2,8 @@ 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>, Andrew Lau <netsnipe@users.sourceforge.net>, 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>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Josselin Mouette <joss@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@burtonini.com>, Takuo KITAME <kitame@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Akira TAGOH <tagoh@debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, 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>, Johannes Rohr <j.rohr@comlink.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Ondřej Surý <ondrej@debian.org>, Rob Bradford <rob@debianplanet.org>, Robert McQueen <robot101@debian.org>, Ross Burton <ross@burtonini.com>, Takuo KITAME <kitame@debian.org>
-Build-Depends: debhelper (>= 4.0), dpatch, automake, gettext, autoconf, gawk, pkg-config, libglib2.0-dev, xlibs-dev, libpopt-dev, texinfo, gnome-pkg-tools
+Build-Depends: debhelper (>= 4.0), dpatch, gettext, gawk, pkg-config, libglib2.0-dev, xlibs-dev, libpopt-dev, texinfo, gnome-pkg-tools, cdbs
 Standards-Version: 3.6.1.0
 
 Package: libgtop2
@@ -22,7 +22,7 @@ Description: Libraries for gtop system monitoring library (part of Gnome 2)
 Package: libgtop2-dev
 Architecture: any
 Section: libdevel
-Depends: libgtop2 (= ${Source-Version}), libgtk2.0-dev
+Depends: libgtop2 (= ${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"
  .

debian/control.in

@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Sebastien Bacher <seb128@debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 4.0), dpatch, automake, gettext, autoconf, gawk, pkg-config, libglib2.0-dev, xlibs-dev, libpopt-dev, texinfo, gnome-pkg-tools
+Build-Depends: debhelper (>= 4.0), dpatch, gettext, gawk, pkg-config, libglib2.0-dev, xlibs-dev, libpopt-dev, texinfo, gnome-pkg-tools, cdbs
 Standards-Version: 3.6.1.0
 
 Package: libgtop2
@@ -22,7 +22,7 @@ Description: Libraries for gtop system monitoring library (part of Gnome 2)
 Package: libgtop2-dev
 Architecture: any
 Section: libdevel
-Depends: libgtop2 (= ${Source-Version}), libgtk2.0-dev
+Depends: libgtop2 (= ${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"
  .

debian/libgtop-daemon.substvars

@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.2.4-4), zlib1g (>= 1:1.1.3)

debian/libgtop1.substvars

@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.2.4-4), libglib1.2 (>= 1.2.0)

debian/libgtop2-daemon.files

@@ -1 +0,0 @@
-usr/bin/libgtop_daemon2

debian/libgtop2-daemon.install

@@ -0,0 +1 @@
+debian/tmp/usr/bin/libgtop_daemon2

debian/libgtop2-dev.files

@@ -1,21 +0,0 @@
-usr/include/libgtop-2.0/*
-usr/lib/libgnomesupport-2.0.a
-usr/lib/libgnomesupport-2.0.la
-usr/lib/libgnomesupport-2.0.so
-usr/lib/libgtop-2.0.a
-usr/lib/libgtop-2.0.la
-usr/lib/libgtop-2.0.so
-usr/include/gnome/*
-usr/lib/libgtop_common-2.0.a
-usr/lib/libgtop_common-2.0.la
-usr/lib/libgtop_common-2.0.so
-usr/lib/libgtop_names-2.0.a
-usr/lib/libgtop_names-2.0.la
-usr/lib/libgtop_names-2.0.so
-usr/lib/libgtop_suid_common-2.0.a
-usr/lib/libgtop_suid_common-2.0.la
-usr/lib/libgtop_suid_common-2.0.so
-usr/lib/libgtop_sysdeps-2.0.a
-usr/lib/libgtop_sysdeps-2.0.la
-usr/lib/libgtop_sysdeps-2.0.so
-usr/lib/pkgconfig/libgtop-2.0.pc

debian/libgtop2-dev.install

@@ -0,0 +1,6 @@
+debian/tmp/usr/include/libgtop-2.0/*
+debian/tmp/usr/lib/libgtop-2.0.a
+debian/tmp/usr/lib/libgtop-2.0.la
+debian/tmp/usr/lib/libgtop-2.0.so
+debian/tmp/usr/include/gnome/*
+debian/tmp/usr/lib/pkgconfig/*

debian/libgtop2.docs

@@ -1,6 +1,3 @@
-RELNOTES-0.25
-RELNOTES-1.0
-RELNOTES-1.0.x
 LIBGTOP-VERSION
 README
 NEWS

debian/libgtop2.files

@@ -1,4 +0,0 @@
-usr/share/locale/*
-usr/lib/libgnomesupport-2.0.so.0.0.0
-usr/lib/*.so.0.0.8
-usr/lib/*.so.0

debian/libgtop2.install

@@ -0,0 +1,2 @@
+debian/tmp/usr/share/locale/*
+debian/tmp/usr/lib/*.so.2*

debian/patches/00list

@@ -1,6 +1 @@
-01_kernel26-headers.dpatch
+02_fix_link
-02_fix_link.dpatch
-03_mem_values.dpatch
-04_mem_values2.dpatch
-05_cpu_values.dpatch
-

debian/patches/02_fix_link.dpatch

@@ -23,10 +23,10 @@ esac
 exit 0
 
 @DPATCH@
-diff -urNad /tmp/libgtop2-2.0.8/sysdeps/common/Makefile.in libgtop2-2.0.8/sysdeps/common/Makefile.in
+diff -u libgtop2-2.5.2/sysdeps/common/Makefile.in.orig libgtop2-2.5.2/sysdeps/common/Makefile.in
---- /tmp/libgtop2-2.0.8/sysdeps/common/Makefile.in	2003-12-19 17:01:00.000000000 +0100
+--- libgtop2-2.5.2/sysdeps/common/Makefile.in.orig	2004-03-27 02:53:38.000000000 +0100
-+++ libgtop2-2.0.8/sysdeps/common/Makefile.in	2003-12-30 22:04:34.000000000 +0100
++++ libgtop2-2.5.2/sysdeps/common/Makefile.in	2004-03-27 02:54:59.000000000 +0100
-@@ -160,7 +160,7 @@
+@@ -160,12 +160,12 @@
  				  $(inodedb_SRCLIST)
  
  
@@ -34,16 +34,10 @@ diff -urNad /tmp/libgtop2-2.0.8/sysdeps/common/Makefile.in libgtop2-2.0.8/sysdep
 +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 = xmalloc.c error.c sysdeps_suid.c
+ libgtop_suid_common_2_0_la_SOURCES = error.c sysdeps_suid.c
-diff -urNad /tmp/libgtop2-2.0.8/sysdeps/linux/Makefile.in libgtop2-2.0.8/sysdeps/linux/Makefile.in
---- /tmp/libgtop2-2.0.8/sysdeps/linux/Makefile.in	2003-12-19 17:01:01.000000000 +0100
-+++ libgtop2-2.0.8/sysdeps/linux/Makefile.in	2003-12-30 22:04:55.000000000 +0100
-@@ -158,7 +158,7 @@
  
- libgtop_sysdeps_2_0_la_LIBADD = @GLIB_LIBS@
+-libgtop_suid_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
++libgtop_suid_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -L`pwd`/../../lib/.libs
  
--libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+ EXTRA_DIST = inodedb.c
-+libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -L`pwd`/../../lib/.libs
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h
- libgtopincludedir = $(includedir)/libgtop-2.0

debian/rules

@@ -1,96 +1,9 @@
 #!/usr/bin/make -f
 
-# Include dpatch stuff.
+include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/dpatch/dpatch.make
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
+include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
-configure: configure-stamp
+DEB_CONFIGURE_EXTRA_FLAGS := --without-xauth --with-x
-configure-stamp:
-	dh_testdir
 
-	# need to run libtoolize before configure because
-	# config.guess is out of date
-	#libtoolize --force
-
-        # Add here commands to configure the package.
-	./configure --prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--without-xauth \
-		--with-x
-
-	touch configure-stamp
-
-build: patch configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	perl -i -pe 's,-lglib-2.0,-lglib-2.0 $(CURDIR)/lib/libgtop-2.0.la,' sysdeps/common/Makefile
-	rm sysdeps/common/*.lo
-
-	$(MAKE) -C sysdeps/common
-
-	perl -i -pe 's,-lglib-2.0,-lglib-2.0 $(CURDIR)/lib/libgtop-2.0.la,' sysdeps/linux/Makefile
-	rm sysdeps/linux/*.lo
-
-	$(MAKE) -C sysdeps/linux
-
-	touch build-stamp
-
-clean::	unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-
-	dh_clean
-
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
-
-	dh_movefiles
-
-# Build architecture-independent files here.
-binary-indep: build install
-#nothing
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a
-	dh_installexamples -a
-#	dh_installmenu -a
-#	dh_installinit -a
-#	dh_installcron -a
-	dh_installman -a
-	dh_installinfo -a
-#	dh_undocumented libgtop_daemon.1
-	dh_installchangelogs -a
-	dh_strip -a
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_installdeb -a
-#	dh_perl -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure