From c2c229f61da88d9ef1ad1cd033de5a42a943b5d2 Mon Sep 17 00:00:00 2001 From: Jose Carlos Garcia Sogo Date: Sun, 28 Mar 2004 15:22:05 +0000 Subject: [PATCH] Version 2.5.2-1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 | 19 +++++++ debian/control | 6 +- debian/control.in | 4 +- debian/libgtop-daemon.substvars | 1 - debian/libgtop1.substvars | 1 - debian/libgtop2-daemon.files | 1 - debian/libgtop2-daemon.install | 1 + debian/libgtop2-dev.files | 21 ------- debian/libgtop2-dev.install | 6 ++ debian/libgtop2.docs | 3 - debian/libgtop2.files | 4 -- debian/libgtop2.install | 2 + debian/patches/00list | 7 +-- debian/patches/02_fix_link.dpatch | 26 ++++----- debian/rules | 95 ++----------------------------- 15 files changed, 48 insertions(+), 149 deletions(-) mode change 100644 => 100755 debian/changelog mode change 100644 => 100755 debian/control mode change 100644 => 100755 debian/control.in delete mode 100644 debian/libgtop-daemon.substvars delete mode 100644 debian/libgtop1.substvars delete mode 100644 debian/libgtop2-daemon.files create mode 100755 debian/libgtop2-daemon.install delete mode 100644 debian/libgtop2-dev.files create mode 100755 debian/libgtop2-dev.install mode change 100644 => 100755 debian/libgtop2.docs delete mode 100644 debian/libgtop2.files create mode 100755 debian/libgtop2.install mode change 100644 => 100755 debian/patches/00list mode change 100644 => 100755 debian/patches/02_fix_link.dpatch diff --git a/debian/changelog b/debian/changelog old mode 100644 new mode 100755 index 2dc04a52..1a0e02ae --- a/debian/changelog +++ b/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 Sat, 27 Mar 2004 16:03:56 +0100 + libgtop2 (2.0.8-7) unstable; urgency=low * debian/patches/05_cpu_values.dpatch: diff --git a/debian/control b/debian/control old mode 100644 new mode 100755 index e10396f7..c3feff27 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: libgtop2 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andrew Lau , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Johannes Rohr , Jordi Mallach , Josselin Mouette , Rob Bradford , Robert McQueen , Ross Burton , Takuo KITAME -Build-Depends: debhelper (>= 4.0), dpatch, automake, gettext, autoconf, gawk, pkg-config, libglib2.0-dev, xlibs-dev, libpopt-dev, texinfo, gnome-pkg-tools +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andrew Lau , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Ondřej Surý , Rob Bradford , Robert McQueen , Ross Burton , Takuo KITAME +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" . diff --git a/debian/control.in b/debian/control.in old mode 100644 new mode 100755 index 73876dcd..6fec7293 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sebastien Bacher 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" . diff --git a/debian/libgtop-daemon.substvars b/debian/libgtop-daemon.substvars deleted file mode 100644 index f85b511a..00000000 --- a/debian/libgtop-daemon.substvars +++ /dev/null @@ -1 +0,0 @@ -shlibs:Depends=libc6 (>= 2.2.4-4), zlib1g (>= 1:1.1.3) diff --git a/debian/libgtop1.substvars b/debian/libgtop1.substvars deleted file mode 100644 index b14de184..00000000 --- a/debian/libgtop1.substvars +++ /dev/null @@ -1 +0,0 @@ -shlibs:Depends=libc6 (>= 2.2.4-4), libglib1.2 (>= 1.2.0) diff --git a/debian/libgtop2-daemon.files b/debian/libgtop2-daemon.files deleted file mode 100644 index 9e5c88fb..00000000 --- a/debian/libgtop2-daemon.files +++ /dev/null @@ -1 +0,0 @@ -usr/bin/libgtop_daemon2 diff --git a/debian/libgtop2-daemon.install b/debian/libgtop2-daemon.install new file mode 100755 index 00000000..4dafa555 --- /dev/null +++ b/debian/libgtop2-daemon.install @@ -0,0 +1 @@ +debian/tmp/usr/bin/libgtop_daemon2 diff --git a/debian/libgtop2-dev.files b/debian/libgtop2-dev.files deleted file mode 100644 index bdf7d8ff..00000000 --- a/debian/libgtop2-dev.files +++ /dev/null @@ -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 diff --git a/debian/libgtop2-dev.install b/debian/libgtop2-dev.install new file mode 100755 index 00000000..7c04464b --- /dev/null +++ b/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/* diff --git a/debian/libgtop2.docs b/debian/libgtop2.docs old mode 100644 new mode 100755 index 33b3cb55..31a26d4f --- a/debian/libgtop2.docs +++ b/debian/libgtop2.docs @@ -1,6 +1,3 @@ -RELNOTES-0.25 -RELNOTES-1.0 -RELNOTES-1.0.x LIBGTOP-VERSION README NEWS diff --git a/debian/libgtop2.files b/debian/libgtop2.files deleted file mode 100644 index c09b8c69..00000000 --- a/debian/libgtop2.files +++ /dev/null @@ -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 diff --git a/debian/libgtop2.install b/debian/libgtop2.install new file mode 100755 index 00000000..eb41c4d7 --- /dev/null +++ b/debian/libgtop2.install @@ -0,0 +1,2 @@ +debian/tmp/usr/share/locale/* +debian/tmp/usr/lib/*.so.2* diff --git a/debian/patches/00list b/debian/patches/00list old mode 100644 new mode 100755 index a80e1188..a92c6086 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,6 +1 @@ -01_kernel26-headers.dpatch -02_fix_link.dpatch -03_mem_values.dpatch -04_mem_values2.dpatch -05_cpu_values.dpatch - +02_fix_link diff --git a/debian/patches/02_fix_link.dpatch b/debian/patches/02_fix_link.dpatch old mode 100644 new mode 100755 index 9ae07091..ef17dd10 --- a/debian/patches/02_fix_link.dpatch +++ b/debian/patches/02_fix_link.dpatch @@ -23,27 +23,21 @@ esac exit 0 @DPATCH@ -diff -urNad /tmp/libgtop2-2.0.8/sysdeps/common/Makefile.in libgtop2-2.0.8/sysdeps/common/Makefile.in ---- /tmp/libgtop2-2.0.8/sysdeps/common/Makefile.in 2003-12-19 17:01:00.000000000 +0100 -+++ libgtop2-2.0.8/sysdeps/common/Makefile.in 2003-12-30 22:04:34.000000000 +0100 -@@ -160,7 +160,7 @@ +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_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 -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_suid_common_2_0_la_SOURCES = error.c sysdeps_suid.c - 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) -+libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -L`pwd`/../../lib/.libs - - libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h - libgtopincludedir = $(includedir)/libgtop-2.0 + EXTRA_DIST = inodedb.c + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/debian/rules b/debian/rules index eaad7b91..53b65aad 100755 --- a/debian/rules +++ b/debian/rules @@ -1,96 +1,9 @@ #!/usr/bin/make -f -# Include dpatch stuff. -include /usr/share/dpatch/dpatch.make - +include /usr/share/cdbs/1/rules/debhelper.mk +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 -configure-stamp: - dh_testdir +DEB_CONFIGURE_EXTRA_FLAGS := --without-xauth --with-x - # 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