[goffice] Updated debianisation

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

commit 6f8e32a2e6cf119ec7515a2df71ab699f79f18f7
Author: J.H.M. Dassen (Ray) <jdassen debian org>
Date:   Tue Mar 9 22:17:15 2010 +0100

    Updated debianisation

 debian/changelog                                |    7 +++++++
 debian/control                                  |   18 ++++++++++--------
 debian/libgoffice-dbg.links                     |    2 +-
 debian/patches/refresh-config-sub-guess-0.8.1-1 |   12 ++++++------
 debian/patches/series                           |    2 +-
 debian/rules                                    |   12 +++++++-----
 6 files changed, 32 insertions(+), 21 deletions(-)
---
diff --git a/debian/changelog b/debian/changelog
index 62f92f7..db58039 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+goffice (0.8.1-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * [debian/*] Reflect soname in package naming. (Closes: #570351)
+
+ -- J.H.M. Dassen (Ray) <jdassen debian org>  Tue, 09 Mar 2010 21:23:00 +0100
+
 goffice (0.8.0-1) unstable; urgency=low
 
   * New upstream stable release.
diff --git a/debian/control b/debian/control
index 5855b57..501c77b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,12 +15,12 @@ Vcs-git: git://git.gnome.org/goffice
 Vcs-Browser: http://git.gnome.org/cgit/goffice/
 Standards-Version: 3.8.4
 
-Package: libgoffice-0-8-dev
+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 (= ${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, libgsf-1-dev (>= 1.14.9), ${misc:Depends}
+Conflicts: libgoffice-0-dev (<< 0.4.2-2), libgoffice-0-5-dev, libgoffice-0-8-dev
+Replaces: libgoffice-0-5-dev, libgoffice-0-8-dev
+Depends: libgoffice-0.8-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, libgsf-1-dev (>= 1.14.9), ${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+.
@@ -31,7 +31,7 @@ Package: libgoffice-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libgoffice-0-8 (= ${binary:Version}), ${misc:Depends}
+Depends: libgoffice-0.8-8 (= ${binary:Version}), ${misc:Depends}
 Conflicts: libgoffice-0-6-dbg
 Replaces: libgoffice-0-6-dbg
 Description: Document centric objects library - debugging files
@@ -41,17 +41,19 @@ Description: Document centric objects library - debugging files
  These are the files used to debug (applications that use) the GOffice
  library.
 
-Package: libgoffice-0-8
+Package: libgoffice-0.8-8
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libgoffice-0-8-common (>= ${binary:Version}), ${misc:Depends}
+Conflicts: libgoffice-0-8
+Replaces: libgoffice-0-8
+Depends: ${shlibs:Depends}, libgoffice-0.8-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+.
  .
  These are the files needed to run applications that use GOffice.
 
-Package: libgoffice-0-8-common
+Package: libgoffice-0.8-8-common
 Section: libs
 Architecture: all
 Depends: ${misc:Depends}
diff --git a/debian/libgoffice-dbg.links b/debian/libgoffice-dbg.links
index 31753fd..1667ea5 100644
--- a/debian/libgoffice-dbg.links
+++ b/debian/libgoffice-dbg.links
@@ -1 +1 @@
-/usr/share/doc/libgoffice-0-8	/usr/share/doc/libgoffice-dbg
+/usr/share/doc/libgoffice-0.8-8	/usr/share/doc/libgoffice-dbg
diff --git a/debian/patches/refresh-config-sub-guess-0.8.1-1 b/debian/patches/refresh-config-sub-guess-0.8.1-1
index 30fa59c..94348f1 100644
--- a/debian/patches/refresh-config-sub-guess-0.8.1-1
+++ b/debian/patches/refresh-config-sub-guess-0.8.1-1
@@ -1,6 +1,6 @@
-diff -ruN goffice-0.8.0.orig/config.guess goffice-0.8.0/config.guess
---- goffice-0.8.0.orig/config.guess	2010-02-12 00:49:16.000000000 +0100
-+++ goffice-0.8.0/config.guess	2010-02-14 16:51:18.000000000 +0100
+diff -ru goffice-0.8.1.orig/config.guess goffice-0.8.1/config.guess
+--- goffice-0.8.1.orig/config.guess	2010-03-09 02:12:30.000000000 +0100
++++ goffice-0.8.1/config.guess	2010-03-09 08:41:20.000000000 +0100
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -351,9 +351,9 @@ diff -ruN goffice-0.8.0.orig/config.guess goffice-0.8.0/config.guess
  	exit ;;
      *:*VMS:*:*)
      	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-diff -ruN goffice-0.8.0.orig/config.sub goffice-0.8.0/config.sub
---- goffice-0.8.0.orig/config.sub	2010-02-12 00:49:16.000000000 +0100
-+++ goffice-0.8.0/config.sub	2010-02-14 16:51:18.000000000 +0100
+diff -ru goffice-0.8.1.orig/config.sub goffice-0.8.1/config.sub
+--- goffice-0.8.1.orig/config.sub	2010-03-09 02:12:30.000000000 +0100
++++ goffice-0.8.1/config.sub	2010-03-09 08:41:20.000000000 +0100
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
diff --git a/debian/patches/series b/debian/patches/series
index b4047c8..314d9db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-refresh-config-sub-guess-0.8.0-1
+refresh-config-sub-guess-0.8.1-1
diff --git a/debian/rules b/debian/rules
index 7cd9c6e..bea36dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,13 +14,15 @@ versionh=$(shell echo $(upstreamversion) | sed -e 's/\.[^.]*$$//')
 versiont=$(shell echo $(upstreamversion) | sed -e 's/^.*\.//')
 nextupstreamversion=$(shell echo $(versionh).$$(expr $(versiont) + 1))
 
-# The library file name. This goes into the package names (which is why we
-# need to change the periods in it). The debian/* files must match.
-baselibname=$(shell grep -i '^GOFFICE_API_VER=[0-9]' configure | sed -e 's/^.*=/libgoffice-/' -e s/\\./-/g)
-
+# API version
+apiver=$(shell grep -i '^GOFFICE_API_VER=[0-9]' configure | sed -e 's/^.*=//')
+# ABI major version
+somajor=$(shell grep -i '^VERSION_INFO=[0-9]' configure | sed -e 's/^.*=//' -e 's/:.*//')
+# The base library name
+baselibname=libgoffice-$(apiver)-$(somajor)
 pruntime=$(baselibname)
 pcommon=$(baselibname)-common
-pdevel=$(baselibname)-dev
+pdevel=libgoffice-$(apiver)-dev
 pdbg=libgoffice-dbg
 
 # These are used for cross-compiling and for saving the configure script