Your message dated Sun, 20 Jun 2010 12:02:22 +0000
with message-id <[email protected]>
and subject line Bug#583370: fixed in gnome-utils 2.30.0-2
has caused the Debian Bug report #583370,
regarding gnome-utils: clean rules by using cdbs only
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
583370: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=583370
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: gnome-utils
User: [email protected]
Usertags: origin-ubuntu maverick ubuntu-patch
Version: 2.30.0-1
Severity: wishlist
Tags: patch

The current debian packaging uses cdbs and debhelper together in the
rules, using cdbs only would simply it. The coming change also change
the .files to .install in the debian directory


reverted:
--- gnome-utils-2.30.0/debian/libgdict-1.0-6.files
+++ gnome-utils-2.30.0.orig/debian/libgdict-1.0-6.files
@@ -1 +0,0 @@
-usr/lib/libgdict*.so.*
diff -u gnome-utils-2.30.0/debian/gnome-utils.install gnome-utils-2.30.0/debian/gnome-utils.install
--- gnome-utils-2.30.0/debian/gnome-utils.install
+++ gnome-utils-2.30.0/debian/gnome-utils.install
@@ -1 +1,15 @@
-debian/pixmaps/*.xpm usr/share/pixmaps/
+etc/gconf usr/share/
+../pixmaps/*.xpm usr/share/pixmaps/
+usr/bin
+usr/lib/bonobo
+usr/lib/gnome-utils
+usr/share/applications
+usr/share/baobab
+usr/share/gdict-1.0
+usr/share/gnome*
+usr/share/icons
+usr/share/locale
+usr/share/man
+usr/share/omf
+usr/share/pixmaps
+
reverted:
--- gnome-utils-2.30.0/debian/libgdict-1.0-dev.files
+++ gnome-utils-2.30.0.orig/debian/libgdict-1.0-dev.files
@@ -1,6 +0,0 @@
-usr/include
-usr/lib/*.la
-usr/lib/*.so
-usr/lib/*.a
-usr/lib/pkgconfig
-usr/share/gtk-doc
diff -u gnome-utils-2.30.0/debian/rules gnome-utils-2.30.0/debian/rules
--- gnome-utils-2.30.0/debian/rules
+++ gnome-utils-2.30.0/debian/rules
@@ -3,95 +3,25 @@
+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/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-ipv6=yes --disable-scrollkeeper --enable-gdict-applet=yes
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-configure_flags += \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--sysconfdir=/etc \
-		--libexecdir=\$${prefix}/lib/gnome-utils \
-		--enable-ipv6=yes \
-		--disable-scrollkeeper \
-		--build=$(DEB_BUILD_GNU_TYPE)
-
-ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-	configure_flags += --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-config.status: configure
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
+post-patches::
 	# Change DTD URL in documentation to the one on the local system, so
 	# the DTD is not fetched off the network
 	find -name "*.xml" -print0 | xargs -0 perl -i -pe 's/http:\/\/www.oasis-open.org\/docbook\/xml\/4.1.2\/docbookx.dtd/\/usr\/share\/sgml\/docbook\/dtd\/xml\/4.1.2\/docbookx.dtd/'
 	# Workaround for a broken .schemas file, see GNOME #599317
 	rm -f gsearchtool/gnome-search-tool.schemas
-	$(MAKE)
-	touch build-stamp
 
 clean::
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	-test -r /usr/share/misc/config.sub && test -r config.sub && \
-		cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && test -r config.guess && \
-		cp -f /usr/share/misc/config.guess config.guess
 	rm -f po/.intltool-merge-cache
 	rm -f intltool-extract intltool-merge intltool-update
 	find . -name "*.omf.out" -exec rm -f {} \;
-	dh_clean
-	rm -f debian/gnome-terminal.1
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 $(MAKE) install DESTDIR=$(CURDIR)/debian/gnome-utils prefix=$(DESTDIR)/usr
-	# Remove scrollkeeper generated files. Re-created in postinst on user's
-	# system
-	-rm -rf $(CURDIR)/debian/gnome-utils/usr/var
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs ChangeLog
-	cp baobab/README debian/gnome-utils/usr/share/doc/gnome-utils/README.baobab
-	cp gnome-dictionary/README debian/gnome-utils/usr/share/doc/gnome-utils/README.gdict
-	dh_install
-	dh_installmenu
-	dh_installman
-	dh_movefiles --sourcedir=debian/gnome-utils
-	# remove empty directories from the gnome-utils package
-	rm -rf debian/gnome-utils/usr/include/ debian/gnome-utils/usr/lib/pkgconfig/
-	# drop useless libtool file
-	rm -f debian/libgdict-1.0-dev/usr/lib/*.la
-	dh_gconf
-	dh_makeshlibs
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+binary-install/gnome-utils::
+	cp baobab/README debian/$(cdbs_curpkg)/usr/share/doc/gnome-utils/README.baobab
+	cp gnome-dictionary/README debian/$(cdbs_curpkg)/usr/share/doc/gnome-utils/README.gdict
only in patch2:
unchanged:
--- gnome-utils-2.30.0.orig/debian/libgdict-1.0-6.install
+++ gnome-utils-2.30.0/debian/libgdict-1.0-6.install
@@ -0,0 +1 @@
+usr/lib/libgdict*.so.*
only in patch2:
unchanged:
--- gnome-utils-2.30.0.orig/debian/libgdict-1.0-dev.install
+++ gnome-utils-2.30.0/debian/libgdict-1.0-dev.install
@@ -0,0 +1,6 @@
+usr/include
+usr/lib/*.la
+usr/lib/*.so
+usr/lib/*.a
+usr/lib/pkgconfig
+usr/share/gtk-doc

--- End Message ---
--- Begin Message ---
Source: gnome-utils
Source-Version: 2.30.0-2

We believe that the bug you reported is fixed in the latest version of
gnome-utils, which is due to be installed in the Debian FTP archive:

baobab_2.30.0-2_amd64.deb
  to main/g/gnome-utils/baobab_2.30.0-2_amd64.deb
gnome-dictionary_2.30.0-2_amd64.deb
  to main/g/gnome-utils/gnome-dictionary_2.30.0-2_amd64.deb
gnome-screenshot_2.30.0-2_amd64.deb
  to main/g/gnome-utils/gnome-screenshot_2.30.0-2_amd64.deb
gnome-search-tool_2.30.0-2_amd64.deb
  to main/g/gnome-utils/gnome-search-tool_2.30.0-2_amd64.deb
gnome-system-log_2.30.0-2_amd64.deb
  to main/g/gnome-utils/gnome-system-log_2.30.0-2_amd64.deb
gnome-utils-common_2.30.0-2_all.deb
  to main/g/gnome-utils/gnome-utils-common_2.30.0-2_all.deb
gnome-utils_2.30.0-2.debian.tar.gz
  to main/g/gnome-utils/gnome-utils_2.30.0-2.debian.tar.gz
gnome-utils_2.30.0-2.dsc
  to main/g/gnome-utils/gnome-utils_2.30.0-2.dsc
gnome-utils_2.30.0-2_all.deb
  to main/g/gnome-utils/gnome-utils_2.30.0-2_all.deb
libgdict-1.0-6_2.30.0-2_amd64.deb
  to main/g/gnome-utils/libgdict-1.0-6_2.30.0-2_amd64.deb
libgdict-1.0-dev_2.30.0-2_amd64.deb
  to main/g/gnome-utils/libgdict-1.0-dev_2.30.0-2_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Josselin Mouette <[email protected]> (supplier of updated gnome-utils package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Sat, 19 Jun 2010 15:20:04 +0200
Source: gnome-utils
Binary: gnome-utils-common libgdict-1.0-6 libgdict-1.0-dev baobab 
gnome-dictionary gnome-screenshot gnome-search-tool gnome-system-log gnome-utils
Architecture: source all amd64
Version: 2.30.0-2
Distribution: unstable
Urgency: low
Maintainer: Debian GNOME Maintainers 
<[email protected]>
Changed-By: Josselin Mouette <[email protected]>
Description: 
 baobab     - GNOME disk usage analyzer
 gnome-dictionary - GNOME dictionary application
 gnome-screenshot - screenshot application for GNOME
 gnome-search-tool - GNOME tool to search files
 gnome-system-log - system log viewer for GNOME
 gnome-utils - GNOME desktop utilities - transitional package
 gnome-utils-common - data files for the GNOME utilities
 libgdict-1.0-6 - GNOME Dictionary base library - runtime
 libgdict-1.0-dev - GNOME Dictionary base library - development files
Closes: 583370 584981
Changes: 
 gnome-utils (2.30.0-2) unstable; urgency=low
 .
   * Update build-dependencies, especially add missing one on
     gtk-doc-tools.
   * Switch to cdbs, based on Ubuntu packaging. Closes: #583370.
   * Remove workaround for docbook stuff, gtk-doc-tools should bring
     docbook-xml and its XML catalog.
   * Remove workaround for broken .schemas file, it’s been fixed
     upstream.
   * Split gnome-utils into one package per tool. Closes: #584981.
   * Switch to 3.0 (quilt) source format.
Checksums-Sha1: 
 78c174c086405fe7451f7bb0f28f7b30986da7ed 1966 gnome-utils_2.30.0-2.dsc
 e28ae1385282605d3b4dbef7161d2862919f2350 28330 
gnome-utils_2.30.0-2.debian.tar.gz
 146364f8469f76aac17edbfcb8738f1b9ba58756 1885478 
gnome-utils-common_2.30.0-2_all.deb
 32e5a067335ad7f3f14e1bb4a5ec3bbb7f05af35 76800 gnome-utils_2.30.0-2_all.deb
 5374525a522838502a1f19e9fa0937734ee29be7 143098 
libgdict-1.0-6_2.30.0-2_amd64.deb
 530d3eb50adee301bde7c7078f501dd9d9cb93ed 223446 
libgdict-1.0-dev_2.30.0-2_amd64.deb
 1639aa74f63505f4608eff77584a7e5449ab61ad 2482208 baobab_2.30.0-2_amd64.deb
 09dff8d5616df75fd4bacbce11f405b568d9dae2 1833046 
gnome-dictionary_2.30.0-2_amd64.deb
 58aeaa976684e0154a5836d674f10da34fff6b77 133832 
gnome-screenshot_2.30.0-2_amd64.deb
 c1bf07a16cce0c9b6bd46dadef7046cda17fd712 605640 
gnome-search-tool_2.30.0-2_amd64.deb
 ae56fa0095254a22d806478db1129b8517b86fd6 1303756 
gnome-system-log_2.30.0-2_amd64.deb
Checksums-Sha256: 
 fc19eee0dd0ae520117e655a62ac42b71c020069e5a1ff6eabc48732a0d16807 1966 
gnome-utils_2.30.0-2.dsc
 dd4a16105013da243c57a4407b2659eaaf06567314ca386bb9ddcecbcc032300 28330 
gnome-utils_2.30.0-2.debian.tar.gz
 73364387af827c8a1b57d349326cace28eb630e86ec8a3e00db4dce55342194d 1885478 
gnome-utils-common_2.30.0-2_all.deb
 2e8bfbf148fd677ca433a92dc9f111c9f44affe9d828a82a131875875efd7c6a 76800 
gnome-utils_2.30.0-2_all.deb
 9e0e330ca003952a296da31ab2f4089d30cb3ac409552a8f5184460a1facc68a 143098 
libgdict-1.0-6_2.30.0-2_amd64.deb
 353cbac3434a0ec8650a6fdfcaa7722a1beee9db3b7f7e7dd02f136fee750620 223446 
libgdict-1.0-dev_2.30.0-2_amd64.deb
 cf46e5dcda4b0339cef87ef08ac54967815d29d3e34c8bb947ae5ea9fc13bfcc 2482208 
baobab_2.30.0-2_amd64.deb
 e8a4fbc367651b511610f5be25ed8e127aaa47ee4721a504f064c376f64c8e5d 1833046 
gnome-dictionary_2.30.0-2_amd64.deb
 5934764aa11d633a87186c07a32fdddf1887f274cf5372cfb319eda72f76f802 133832 
gnome-screenshot_2.30.0-2_amd64.deb
 8b2fc09f171da7f28215cae7193fb14643019bed6e1b257a2f260512527be141 605640 
gnome-search-tool_2.30.0-2_amd64.deb
 97f0a546df8e75df20a1b85b70449babc4453d9d45e4086bc9a9cdb76c86cc32 1303756 
gnome-system-log_2.30.0-2_amd64.deb
Files: 
 8a911f7c829709939ac530c523bcb014 1966 gnome optional gnome-utils_2.30.0-2.dsc
 a2bf7baaf53d9f232e88547f2b0266ab 28330 gnome optional 
gnome-utils_2.30.0-2.debian.tar.gz
 f71ea7271981c982cb8fb5601e6a9b78 1885478 libs optional 
gnome-utils-common_2.30.0-2_all.deb
 0d33629f5861cb1e45a7d20da826f27e 76800 gnome optional 
gnome-utils_2.30.0-2_all.deb
 a61659ee218864ea753e0021e5ba3f08 143098 libs optional 
libgdict-1.0-6_2.30.0-2_amd64.deb
 9855b360822089e28b8560bc0d0641c5 223446 libdevel optional 
libgdict-1.0-dev_2.30.0-2_amd64.deb
 5ed4a69430a35b71b1631c8908d0e8e6 2482208 gnome optional 
baobab_2.30.0-2_amd64.deb
 879bab0eec63c6bc580e5a261652cb04 1833046 gnome optional 
gnome-dictionary_2.30.0-2_amd64.deb
 98f9d948fd3948b52d3dfa01a4cf71d8 133832 gnome optional 
gnome-screenshot_2.30.0-2_amd64.deb
 aa21f95401e374416430b29ad130b37f 605640 gnome optional 
gnome-search-tool_2.30.0-2_amd64.deb
 177f4ac621adf1957e0d24317c1bc990 1303756 gnome optional 
gnome-system-log_2.30.0-2_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iD8DBQFMHM6hrSla4ddfhTMRAiuzAJ4kBIaoWej2aoZZ4fMoR0vihcPn2ACcC26j
1qAKDunCSgMfrnyQJIK+LTI=
=ig/i
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to