Updated debianisation

debian/changelog

+gnumeric (1.6.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Fixed upstream: crash on close with some spreadsheets. (Closes: #329227)
+  * [debian/*.md5sum] New. Checksums of historical versions of obsoleted
+    conffiles.
+  * [debian/rules, debian/gnumeric-common.install] Install checksum files.
+  * [debian/gnumeric-common.postinst] New. Remove unmodified obsoleted schema
+    files in /etc/gconf/schemas. (Closes: #264324)
+  * [debian/rules] Deal with changed mandir; pass --as-needed to ld.
+  * [debian/gnumeric.install] Updated now that libspreadsheet has version
+    information in its filename.
+  * [debian/control] Bumped goffice and libgsf build dependencies per 
+    configure.in .
+    Added gnumeric-plugins-extra Depends: python-gtk2. (Closes: #332509)
+  * Upload to experimental due to dependencies.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Mon, 10 Oct 2005 21:17:20 +0200
+
 gnumeric (1.5.90-1) unstable; urgency=low
 
   * New upstream beta release.

debian/control

@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: J.H.M. Dassen (Ray) <jdassen@debian.org>
 Build-Depends: debhelper (>= 4.2.21), dh-buildinfo, gettext, bison, flex,
  scrollkeeper, libxml-parser-perl,
- zlib1g-dev, libglib2.0-dev (>= 2.6.0), libgsf-1-dev (>= 1.12.2),
- libgoffice-1-dev (>= 0.0.4), libxml2-dev (>= 2.6.10-2),
+ zlib1g-dev, libglib2.0-dev (>= 2.6.0), libgsf-1-dev (>= 1.13.2),
+ libgoffice-1-dev (>= 0.1.0), libxml2-dev (>= 2.6.10-2),
  libpango1.0-dev (>= 1.8.1),
  libgtk2.0-dev (>= 2.6.0), libglade2-dev (>= 1:2.4.0-1),
  libgnomeprint2.2-dev (>= 2.8.2), libgnomeprintui2.2-dev (>= 2.8.2),
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 4.2.21), dh-buildinfo, gettext, bison, flex,
  libgconf2-dev (>= 2.6.2-1), libbonobo2-dev (>= 2.6.2-4),
  libbonoboui2-dev (>= 2.6.1-1),
  libgnome2-dev (>= 2.4.0-2), libgnomeui-dev (>= 2.4.0-2),
- libgsf-gnome-1-dev (>= 1.12.2),
+ libgsf-gnome-1-dev (>= 1.13.2),
  libgda2-dev (>= 1.0.4-1), libgnomedb2-dev (>= 1.0.4-7),
  pxlib-dev (>= 0.4.2-1), libperl-dev,
  python2.3-dev, python-gtk2-dev
@@ -77,7 +77,7 @@ Description: documentation for Gnumeric, the GNOME spreadsheet application
 
 Package: gnumeric-plugins-extra
 Architecture: any
-Depends: gnumeric (= ${Source-Version}), ${shlibs:Depends}
+Depends: gnumeric (= ${Source-Version}), python-gtk2, ${shlibs: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)
 Description: additional plugins for the GNOME spreadsheet

debian/gnumeric-common.install

 /usr/share/applications/gnumeric.desktop
+/usr/share/gnumeric/*.md5sum
 /usr/share/gnumeric/*/autoformat-templates/*/*.xml
 /usr/share/gnumeric/*/autoformat-templates/*/.category
 /usr/share/gnumeric/*/glade/*.glade

debian/gnumeric-common.postinst

+#! /bin/sh
+set -e
+
+for s in gnumeric-dialogs.schemas gnumeric-general.schemas gnumeric-plugins.schemas ; do
+	f=/etc/gconf/schemas/$s
+	if [ -e $f ] ; then
+		echo "Obsoleted conffile $f found... "
+		if grep -q '^'$(md5sum $f | sed -e 's/  .*$//')'$' /usr/share/gnumeric/$s.md5sum ; then
+			echo "... no local changes detected. Removing."
+			rm -f $f
+		else
+			echo "... locally modified. Leaving as-is."
+		fi
+	fi
+done
+
+#DEBHELPER#
+
+exit 0

debian/gnumeric-dialogs.schemas.md5sum

+e4749a1d8e6528eb89d5e7f69739a4ab
+3b30b2a55616b9d0c9d7a6a6c3d87140
+f66f3ee26eb661e18fbc4ab068978a79
+d144baf102ebc824225f1625eecc62df
+a53d1d5ed61b40cb014310f75a41ccdb
+7efca9515c65073dc6e5fdd977c6929e
+03ac45d94c384823c1643856039349ec
+f6ab538186d5c45322d0d0c8ea010f2e
+eb8cafa297fb6699b5cd46368077878f
+8c7870ae5940f2833c54d613ef548513
+eb8ecdee45f7a4000e53b90fcc8736de
+447a205696ae77705bb15b85ad1363a3
+53565154ae81c4785f1ea3eec0395379
+d9d7f3e0d388ad168fcff2f9d915af2d
+71c015d77db71bf8ec5ebf5f86958a67

debian/gnumeric-general.schemas.md5sum

+9b0af3c368bdf0dcf0310ad593238fbd
+f80ea9e3cf441c3c4c591adf0e54a2ae
+d69fea2962ccfce7cb6163b169e7441c
+84cc7ca2687cfa7023dcb5f18ccacb1e
+428297de1381632a1732b7f7d0704e39
+8aeade14ebf7d3a62180f2a704902f94
+b5472fcaeec2d91ee99620630da3af9c
+827c7e680ed58266286c976fcf135831
+367c851168bb9c227e0edf15473a8a08
+26600fa41ff14dcd681228a50016f256
+cafbb3876bb04d02266579f8528ab615
+6759ec14e92284c7bc339ecea5865560
+2626bfebcf36e97d3fb97af156060d84
+57f0d2ee08a00d4501b11c60a0b9dd74
+602ce28d13678f4d2a170123ed39e292
+8f279dde262d0d8a065c8cbff164743c

debian/gnumeric-plugins.schemas.md5sum

+ca37a46cd13b0e8ec4d11b1e309d0dda
+a05314cee088c4b12f5e9291e048881d
+a9e08f426e687c8fc73cda259133d1e2
+f73b4ef86fb7bb176e89b970286e2ab5
+975cc3b2d87570fa5744c6daa7527af8
+abb10e4a5a269502caf12a4ae9e7d4e6
+40912979e4ffb0171613bb32ddd709ce

debian/gnumeric.install

@@ -6,6 +6,6 @@
 /usr/lib/gnumeric/*/plugins/*/*.la
 /usr/lib/gnumeric/*/plugins/*/*.so
 /usr/lib/gnumeric/*/plugins/*/*.xml
-/usr/lib/libspreadsheet.so.*
+/usr/lib/libspreadsheet-*.so*
 /usr/share/gnumeric/*/GNOME_Gnumeric-gtk.xml
 /usr/share/man/man*/*

debian/rules

@@ -66,9 +66,9 @@ features+= --without-guile
 
 features+= --without-gb
 
-# The GDA and GnomeDB plugins for gnumeric CVS HEAD now require CVS HEAD
-# versions of GDA and GnomeDB.
-#	Tue,  9 Aug 2005 17:37:14 +0200
+# 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
 
 # Debian's psiconv packages are not recent enough for gnumeric; see
@@ -82,7 +82,9 @@ features+= --with-paradox
 # Spreadsheet indexer for beagle
 features+= --enable-ssindex
 
-confflags :=	--prefix=/usr --sysconfdir=/etc \
+confflags :=	--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
 		--libexecdir=/usr/bin \
                 --enable-compile-warnings=minimum \
@@ -94,7 +96,11 @@ else
 	confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-confflags += LDFLAGS="-Wl,-O1"
+# Make the linker work a bit harder so dynamic loading can be done faster
+#
+# Make the linker only include actual dependencies on libraries, rather than
+# for all libraries specified in the link line.
+confflags += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 
 source-updates:
 	rm -f configure-stamp
@@ -193,6 +199,9 @@ install: build
 	# Low-colour icon for use by the menu system
 	$(INSTALL) -m 644 debian/gnome-gnumeric.xpm `pwd`/debian/tmp/usr/share/pixmaps/
 
+	# Checksums of historical versions of conffiles
+	$(INSTALL) -m 644 debian/gnumeric-dialogs.schemas.md5sum debian/gnumeric-general.schemas.md5sum debian/gnumeric-plugins.schemas.md5sum `pwd`/debian/tmp/usr/share/gnumeric/
+
 	dh_install --sourcedir=`pwd`/debian/tmp --fail-missing
 
 	# Name the binary just "gnumeric"
@@ -214,7 +223,7 @@ install: build
 	done < debian/gnumeric-plugins-extra.install
 
 	# Remove dirs that are now empty
-	-find debian/gnumeric -type d -depth | xargs rmdir >/dev/null 2>&1
+	-find debian/gnumeric -depth -type d | xargs rmdir >/dev/null 2>&1
 
 # Build architecture-independent files here.
 # Pass -i to all debhelper commands in this target to reduce clutter.