[goffice] Updated debianisation

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

commit ac511e9280b46e07be4d357307591c16cbc5e8c2
Author: J.H.M. Dassen (Ray) <jdassen debian org>
Date:   Sun Apr 26 18:13:07 2009 +0200

    Updated debianisation
---
 debian/changelog            |   28 ++++++++++++++++++++++++----
 debian/control              |   19 ++++++++++---------
 debian/libgoffice-dbg.links |    2 +-
 debian/rules                |    5 +++--
 4 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ebaea0..e351ab3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,29 @@
-goffice (0.7.5~pre-1) experimental; urgency=low
+goffice (0.7.5-1) unstable; urgency=low
 
-  * SVN trunk
-  * [debian/libgoffice-0-8-dev.links] Update.
-
- -- J.H.M. Dassen (Ray) <jdassen debian org>  Sun, 29 Mar 2009 20:14:53 +0200
+  * New upstream development release.
+  * [debian/rules]
+    * Fix debian-rules-ignores-make-clean-error.
+    * Removed call to dh_desktop which has been deprecated.
+  * [debian/*.links] Corrected.
+  * [debian/control]
+    * Updated Standards-Version.
+    * Updated section of the debug package.
+    * Have all packages depend on ${misc:Depends}; fixes
+      debhelper-but-no-misc-depends.
+    * Replaced deprecated ${Source-Version} by ${binary:Version}; fixes
+      substvar-source-version-is-deprecated.
+    * Drop -1 package revision from build and runtime dependencies. Fixes
+      build-depends-on-1-revision.
+    * Added runtime dependency for libgoffice-0-8-dev on libgconf2-dev as
+      per libgoffice-0.8.pc.
+    * Follow upstream VCS change: replaced Vcs-Svn by Vcs-git and updated
+      Vcs-Browser.
+  * Applied go_conf_get_type.patch from
+    http://bugzilla.gnome.org/show_bug.cgi?id=580296 to rename
+    go_conf_get_type to go_conf_get_node_type so it is not picked up by
+    gtk-doc-tools. Fixes FTBFS during documentation generation.
+
+ -- J.H.M. Dassen (Ray) <jdassen debian org>  Sun, 26 Apr 2009 17:39:32 +0200
 
 goffice (0.7.4-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a87fe8b..43bbaa1 100644
--- a/debian/control
+++ b/debian/control
@@ -6,19 +6,19 @@ Build-Depends: debhelper (>= 7.0.0), dh-buildinfo,
  gtk-doc-tools (>= 1.4), libxml-parser-perl,
  libglib2.0-dev (>= 2.16.0), libgsf-1-dev (>= 1.14.9),
  libxml2-dev (>= 2.6.10-2), libpango1.0-dev (>= 1.12.1-2),
- libgtk2.0-dev (>= 2.8.17), libglade2-dev (>= 1:2.4.0-1),
- libgconf2-dev (>= 2.6.2-1),
+ libgtk2.0-dev (>= 2.8.17), libglade2-dev (>= 1:2.4.0),
+ libgconf2-dev (>= 2.6.2),
  libxrender-dev, libxext-dev, libcairo2-dev (>= 1.2.0)
-Vcs-Svn: svn://svn.gnome.org/svn/goffice/trunk
-Vcs-Browser: http://svn.gnome.org/viewcvs/goffice/trunk/
-Standards-Version: 3.8.0
+Vcs-git: git://git.gnome.org/goffice
+Vcs-Browser: http://git.gnome.org/cgit/goffice/
+Standards-Version: 3.8.1
 
 Package: libgoffice-0-8-dev
 Section: libdevel
 Architecture: any
 Conflicts: libgoffice-0-dev (<< 0.4.2-2), libgoffice-0-5-dev
 Replaces: libgoffice-0-5-dev
-Depends: libgoffice-0-8 (= ${Source-Version}), libglib2.0-dev (>= 2.16.0), libxml2-dev (>= 2.6.10-2), libgtk2.0-dev (>= 2.8.17), libglade2-dev (>= 1:2.4.0-1), libcairo2-dev (>= 1.2.0)
+Depends: libgoffice-0-8 (= ${binary:Version}), libglib2.0-dev (>= 2.16.0), libxml2-dev (>= 2.6.10-2), libgtk2.0-dev (>= 2.8.17), libglade2-dev (>= 1:2.4.0), libcairo2-dev (>= 1.2.0), libgconf2-dev, ${misc:Depends}
 Description: Document centric objects library - runtime files
  GOffice is a library of document centric objects and utilities building on
  top of GLib and Gtk+.
@@ -26,10 +26,10 @@ Description: Document centric objects library - runtime files
  These are the files needed when building applications that use GOffice.
 
 Package: libgoffice-dbg
-Section: libdevel
+Section: debug
 Priority: extra
 Architecture: any
-Depends: libgoffice-0-8 (= ${Source-Version})
+Depends: libgoffice-0-8 (= ${binary:Version}), ${misc:Depends}
 Conflicts: libgoffice-0-6-dbg
 Replaces: libgoffice-0-6-dbg
 Description: Document centric objects library - debugging files
@@ -42,7 +42,7 @@ Description: Document centric objects library - debugging files
 Package: libgoffice-0-8
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libgoffice-0-8-common (>= ${Source-Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, libgoffice-0-8-common (>= ${binary:Version}), ${misc:Depends}
 Description: Document centric objects library - runtime files
  GOffice is a library of document centric objects and utilities building on
  top of GLib and Gtk+.
@@ -52,6 +52,7 @@ Description: Document centric objects library - runtime files
 Package: libgoffice-0-8-common
 Section: libs
 Architecture: all
+Depends: ${misc:Depends}
 Description: Document centric objects library - common files
  GOffice is a library of document centric objects and utilities building on
  top of GLib and Gtk+.
diff --git a/debian/libgoffice-dbg.links b/debian/libgoffice-dbg.links
index 24f0e25..31753fd 100644
--- a/debian/libgoffice-dbg.links
+++ b/debian/libgoffice-dbg.links
@@ -1 +1 @@
-/usr/share/doc/libgoffice-0-6	/usr/share/doc/libgoffice-dbg
+/usr/share/doc/libgoffice-0-8	/usr/share/doc/libgoffice-dbg
diff --git a/debian/rules b/debian/rules
index 82e3363..1e532e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,7 +117,9 @@ clean:
 	dh_testroot
 	rm -f config-stamp build-stamp
 
-	-$(MAKE) -C build distclean
+	if test -d build && test -f build/Makefile ; then \
+		$(MAKE) -C build distclean; \
+	fi
 	rm -rf build
 	-find -type f -name 'Makefile.am' | sed -e 's/\.am$$//' | xargs rm -f
 
@@ -196,7 +198,6 @@ endif
 	dh_installman
 	dh_gconf
 	dh_scrollkeeper
-	dh_desktop
 ifeq ($(DH_OPTIONS),-s)
 	rm -rvf $(CURDIR)/debian/$(pdbg)/usr/share/doc/$(pdbg)
 endif