[gnumeric] Updated debianisation

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

commit 8636c269b5b217e91054c3d9224901c3d1401853
Author: J.H.M. Dassen (Ray) <jdassen debian org>
Date:   Sun Apr 26 18:14:42 2009 +0200

    Updated debianisation
---
 debian/changelog      |   24 +++++++++++++++++++-----
 debian/control        |   10 ++++++----
 debian/gnumeric.prerm |    6 ------
 debian/rules          |   19 ++-----------------
 4 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30b308e..a585174 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,25 @@
-gnumeric (1.9.6~pre-1) experimental; urgency=low
+gnumeric (1.9.6-1) unstable; urgency=low
 
-  * SVN trunk
-  * [debian/control] Bumped goffice build dependency as per configure.in .
+  * New upstream development release. Upstream changes include:
+    * Basic infrastructure for variable sheet sizes. For example, text and
+      CSV files now load into sheets as big as needed and the silent
+      truncation of a test DBF file with 65536 rows is no longer
+      reproducible. (Closes: #252468, #331356)
+  * [debian/control]
+    * Bumped libgsf and goffice build dependencies as per configure.in .
+    * Fixed debhelper-but-no-misc-depends.
+    * Call dh_prep instead of dh_clean -k.
+    * Updated Standards-Version.
+    * Follow upstream VCS change: replaced Vcs-Svn by Vcs-git and updated
+      Vcs-Browser.
   * [debian/gnumeric.install] Re-enabled schema installation.
-  * [debian/control] Bumped libgsf build dependency per configure.in .
+  * [debian/gnumeric.prerm] Dropped. Fixes maintainer-script-empty.
+  * [debian/rules]
+    * Removed calls to dh_desktop which has been deprecated.
+    * Removed --without-gnomedb, --without-gb, --without-bonobo from
+      features; they are longer needed or recognised.
 
- -- J.H.M. Dassen (Ray) <jdassen debian org>  Sun, 29 Mar 2009 20:15:19 +0200
+ -- J.H.M. Dassen (Ray) <jdassen debian org>  Sun, 26 Apr 2009 17:58:42 +0200
 
 gnumeric (1.9.5-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b241506..3253e7f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ Build-Depends: debhelper (>= 7.0.0), python-central (>= 0.5), dh-buildinfo,
  pxlib-dev (>= 0.5.1-2+b1), libpsiconv-dev (>= 0.9.8-2), libperl-dev,
  python-dev, python-gtk2-dev
 Homepage: http://www.gnumeric.org/
-Vcs-Svn: svn://svn.gnome.org/svn/gnumeric/trunk
-Vcs-Browser: http://svn.gnome.org/viewcvs/gnumeric/trunk/
-Standards-Version: 3.8.0
+Vcs-git: git://git.gnome.org/gnumeric
+Vcs-Browser: http://git.gnome.org/cgit/gnumeric
+Standards-Version: 3.8.1
 
 Package: gnumeric
 Architecture: any
@@ -60,6 +60,7 @@ Description: spreadsheet application for GNOME - main program
 
 Package: gnumeric-common
 Architecture: all
+Depends: ${misc:Depends}
 Replaces: gnumeric (<= 1.2.6-1)
 Description: spreadsheet application for GNOME - common files
  Gnumeric is a spreadsheet application that interoperates well
@@ -72,6 +73,7 @@ Description: spreadsheet application for GNOME - common files
 Package: gnumeric-doc
 Architecture: all
 Section: doc
+Depends: ${misc:Depends}
 Recommends: yelp (>= 2.6.0), gnome-desktop-data
 Suggests: gnumeric (>= ${Upstream-Version}), docbook-xsl
 Conflicts: gnumeric1.0-doc
@@ -86,7 +88,7 @@ Description: spreadsheet application for GNOME - documentation
 
 Package: gnumeric-plugins-extra
 Architecture: any
-Depends: gnumeric (= ${binary:Version}), python-gtk2, ${python:Depends}, ${shlibs:Depends}
+Depends: gnumeric (= ${binary:Version}), python-gtk2, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: gnumeric1.0-python, gnumeric1.0-gda, gnumeric-python, gnumeric-gda
 Replaces: gnumeric1.0-gda, gnumeric1.0-python, gnumeric-python, gnumeric-gda, gnumeric (<= 1.3.92-1)
 XS-Python-Version: current
diff --git a/debian/gnumeric.prerm b/debian/gnumeric.prerm
deleted file mode 100644
index 67858c4..0000000
--- a/debian/gnumeric.prerm
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-set -e
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index e338154..1b21a42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,13 +39,7 @@ features+= --enable-ssindex
 # The GDA and GnomeDB plugins for gnumeric now require versions of GDA and
 # GnomeDB that are not available as packages yet.
 #	Mon, 10 Oct 2005 20:37:06 +0200
-features+= --without-gda --without-gnomedb
-
-# configure.in: "Gnome Basic is extremely API unstable; it is likely that
-# gnumeric will only build with the single version mentioned in
-# configure.in, if at all. It is possible, but unlikely, that Gnome Basic
-# contains security vulnerabilities."
-features+= --without-gb
+features+= --without-gda
 
 # Psion files support
 features+= --with-psiconv
@@ -59,13 +53,6 @@ features+= --with-perl
 # The Python plugin
 features+= PYTHON=/usr/bin/python --with-python
 
-# Bonobo allows us to use parts of other applications as components via
-# CORBA, and was supposed to allow us to work as a component for other
-# applications. However, that promise hasn't really been realised and
-# according to Morten Welinder "drop bonobo from your build.  it's
-# pointless."
-features+= --without-bonobo
-
 # Don't build a PDF of the documentation.
 features+= --disable-pdfdocs
 
@@ -171,7 +158,7 @@ install: DH_OPTIONS=
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	cd build && env GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
@@ -256,7 +243,6 @@ binary-indep: build install
 	dh_installchangelogs ChangeLog -i
 	dh_gconf -i
 	dh_scrollkeeper -i
-	dh_desktop -i
 	dh_icons -i
 	dh_link -i
 	dh_compress -i
@@ -291,7 +277,6 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog -a
 	dh_gconf -a
 	dh_scrollkeeper -a
-	dh_desktop -a
 	dh_icons -a
 	dh_strip -a
 	dh_link -a