[goffice] Updated debianisation

[J.H.M. Dassen (Ray) <jdassen src gnome org>]

commit e9743511e2d2c913a9f3e908422eb86fa2170af6
Author: J.H.M. Dassen (Ray) <jdassen debian org>
Date:   Tue Sep 1 21:39:25 2009 +0200

    Updated debianisation

 debian/changelog                     |   10 ++++++++++
 debian/libgoffice-0-8-common.install |    3 ++-
 debian/rules                         |   12 +++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/debian/changelog b/debian/changelog
index 01cf919..387cda0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+goffice (0.7.10-1) unstable; urgency=low
+
+  * New upstream release.
+  * [debian/libgoffice-0-8-common.install] Follow the migration from Glade
+    to GtkBuilder and include the .ui files instead of the .glade files
+    which are no longer present.
+  * [debian/rules] Update accordingly.
+
+ -- J.H.M. Dassen (Ray) <jdassen debian org>  Tue, 01 Sep 2009 20:28:43 +0200
+
 goffice (0.7.9-1) unstable; urgency=low
 
   * New upstream development release.
diff --git a/debian/libgoffice-0-8-common.install b/debian/libgoffice-0-8-common.install
index 76e1056..fb9ed08 100644
--- a/debian/libgoffice-0-8-common.install
+++ b/debian/libgoffice-0-8-common.install
@@ -1,4 +1,5 @@
-/usr/share/goffice/*/glade/*.glade
+/usr/lib/goffice/*/plugins/*/*.ui
+/usr/share/goffice/*/ui/*.ui
 /usr/share/goffice/*/patterns/*
 /usr/share/locale/*/LC_MESSAGES/*.mo
 /usr/share/pixmaps/*
diff --git a/debian/rules b/debian/rules
index 289f69d..7cd9c6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ nextupstreamversion=$(shell echo $(versionh).$$(expr $(versiont) + 1))
 baselibname=$(shell grep -i '^GOFFICE_API_VER=[0-9]' configure | sed -e 's/^.*=/libgoffice-/' -e s/\\./-/g)
 
 pruntime=$(baselibname)
+pcommon=$(baselibname)-common
 pdevel=$(baselibname)-dev
 pdbg=libgoffice-dbg
 
@@ -153,7 +154,6 @@ install: build
 
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libgoffice-*.la
 
-
 # This single target is used to build all the packages, all at once, or
 # one at a time. So keep in mind: any options passed to commands here will
 # affect _all_ packages. Anything that should only affect one package
@@ -170,6 +170,16 @@ endif
 ifeq ($(DH_OPTIONS),-s)
 	dh_install -p$(pdbg) --sourcedir=debian/tmp
 endif
+	# Remove files from the main package that belong to a more
+	# specialist package
+	# (dh_install doesn't do the right thing here IMO; perhaps it
+	# doesn't like multiple globs in one line)
+	while read l ; do \
+		rm -rvf debian/$(pruntime)/$$l ; \
+	done < debian/$(pcommon).install
+
+	# Remove dirs that are now empty
+	-find debian/tmp -depth -type d | xargs rmdir >/dev/null 2>&1
 
 #	dh_installdebconf -s
 	dh_installdocs -s