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
