Updated debianisation

ChangeLog

+2003-06-09  J.H.M. Dassen (Ray) <jdassen@debian.org>
+
+	* debian/*: Updated from latest package.
+
 2003-06-09  Morten Welinder  <terra@gnome.org>
 
 	* src/mathfunc.c (mathfunc_init): Turn off SIGFPE in here.

OChangeLog-2003-12-23

+2003-06-09  J.H.M. Dassen (Ray) <jdassen@debian.org>
+
+	* debian/*: Updated from latest package.
+
 2003-06-09  Morten Welinder  <terra@gnome.org>
 
 	* src/mathfunc.c (mathfunc_init): Turn off SIGFPE in here.

OChangeLog-2005-11-14

+2003-06-09  J.H.M. Dassen (Ray) <jdassen@debian.org>
+
+	* debian/*: Updated from latest package.
+
 2003-06-09  Morten Welinder  <terra@gnome.org>
 
 	* src/mathfunc.c (mathfunc_init): Turn off SIGFPE in here.

debian/README.Debian

@@ -20,10 +20,6 @@ A: Probably not. Gnumeric relies on an external component for graphing to work.
 Q: How do I insert an image into a worksheet?
 A: Make sure you have the "eog" package installed, and use Insert -> Object.
 
-Q: Why doesn't "File -> Send" work?
-A: Gnumeric relies on an external component for mailing workbooks. Install
-   the "evolution" package.
-
 Q: Where is the <foo> plugin?
 A: Plugins that require additional libraries or programs are packaged 
    separately (e.g. "gnumeric-python"). Do "apt-cache search gnumeric" to

debian/TODO

-* Document No graphing support yet.
 * Document evolution not working (bonobo1 vs 2).
-* Fix Help->Contents.

debian/changelog

+gnumeric (1.1.19-2) unstable; urgency=medium
+
+  * UNRELEASED
+
+ -- <not_a_debian_release>  Mon,  9 Jun 2003 19:17:25 +0200
+
+gnumeric (1.1.19-1) unstable; urgency=medium
+
+  * New upstream release. This is the first GNOME2 release of gnumeric with
+    (limited) graph support. Fixed issues include
+    * Segfault on opening a gnumeric file. (Closes: #193276)
+    * Data->Sort dialog broken. (Closes: #193725)
+  * [debian/rules] Clean out generated files containing paths.
+  * [debian/control] Updated libgsf build dependencies; added new libart build
+    dependency (for graphing).
+  * [Makefile.am, src/Makefile.am] Updated from CVS to fix the generated
+    files.
+  * Removed leftovers from 1.0.x evolution support.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Mon,  9 Jun 2003 10:42:36 +0200
+
+gnumeric (1.1.17-4) unstable; urgency=medium
+
+  * Redid auto* to get rid of leftover experimental change in sc plugin
+    linking.
+  * [debian/rules] Build without optimisation on m68k to try to work around an
+    ICE on that architecture (see #177840).
+  * [debian/control] Round and round the GAL treadmill goes. (Closes: #196331)
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Fri,  6 Jun 2003 20:29:34 +0200
+
+gnumeric (1.1.17-3) unstable; urgency=medium
+
+  * [debian/control]
+    * Updated gnumeric-doc's Replaces.
+    * Updated Standards-Version.
+  * [debian/rules]
+    * Hack in a symlink so the documentation contents are found. 
+      (Closes: #193637)
+    * Add a link for the gnome-logo-icon.png reference as well.
+    * Install in debian/tmp first and ensure everything needed gets moved into
+      a package.
+  * [debian/gnumeric.files] New.
+  * [doc/C/gui-elements.xml, doc/C/worksheet.xml] Fixed file references by
+    added missing extensions.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sat, 17 May 2003 17:22:06 +0200
+
+gnumeric (1.1.17-2) unstable; urgency=medium
+
+  * [debian/gnumeric-doc.files] Updated locations so the -doc package is fine
+    again.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Thu, 15 May 2003 07:36:25 +0200
+
+gnumeric (1.1.17-1) unstable; urgency=low
+
+  * New upstream release. Changes include fixes for
+    * Crash when doing Paste Special under certain circumstances.
+      (Closes: #178810)
+    * sum(A1:A2) with cutting and pasting of A1 / A2 doesn't work.
+      (Closes: #181059)
+  * [debian/control] Updated libgsf build dependencies.
+  * Included fixes for some minor issues from CVS HEAD.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Mon, 12 May 2003 18:38:14 +0200
+
+gnumeric (1.1.16-7) unstable; urgency=medium
+
+  * [debian/control] Round and round the GAL treadmill goes. (Closes: #191786)
+  * [debian/gnumeric.mime] Register as editor for the various MIME types and
+    as composer for application/x-gnumeric. (Closes: #190741)
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun,  4 May 2003 18:52:24 +0200
+
+gnumeric (1.1.16-6) unstable; urgency=low
+
+  * [debian/control] The great GAL treadmill again. Bah. Build against latest
+    GAL. (Closes: #185021)
+  * [debian/control] Added gnumeric Conflicts: gnumeric1.0-doc to simplify
+    switching (yelp can't handle the DocBook SGML that gnumeric1.0-doc is in).
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Tue, 18 Mar 2003 07:12:46 +0100
+
+gnumeric (1.1.16-5) unstable; urgency=low
+
+  * Use a local file rather than a URL for the DocBook DTD for proper
+    documentation registration; thanks Johannes Rohr. (Closes: #180742)
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sat, 15 Feb 2003 17:31:28 +0100
+
+gnumeric (1.1.16-4) unstable; urgency=low
+
+  * [schemas/gnumeric-dialogs.schemas, schemas/gnumeric-general.schemas]:
+    specify <list_type> to fix the warnings on schema installation.
+    (Closes: #179474)
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun,  9 Feb 2003 19:06:37 +0100
+
 gnumeric (1.1.16-3) unstable; urgency=low
 
   * First upload of gnumeric 1.1.x to sid. While 1.1.x is still a development

debian/control

@@ -4,24 +4,25 @@ Priority: optional
 Maintainer: J.H.M. Dassen (Ray) <jdassen@debian.org>
 Build-Depends: debhelper (>= 3.0), gettext, bison, flex, docbook-utils,
  gnome-doc-tools, scrollkeeper,
- libglib2.0-dev (>= 2.0.6-1), libgsf-1-dev (>= 1.7.2-1),
+ libglib2.0-dev (>= 2.0.6-1), libgsf-1-dev (>= 1.8.1-1),
  libgtk2.0-dev (>= 2.0.6-1), libxml2-dev (>= 2.4.23-2),
  libglade2-dev (>= 2.0.0-2), libgnomecanvas2-dev (>= 2.0.2-1),
- libgal2.0-dev (>= 1.99.1-1), libgtk2.0-dev (>= 2.2.0-1),
+ libgal2.0-dev (>= 1.99.6-1), libgtk2.0-dev (>= 2.2.0-1),
  libgnome2-dev (>= 2.0.2-1), libgnomeui-dev (>= 2.0.3-1),
  libgnomeprint2.2-dev (>= 2.2.0-1), libgnomeprintui2.2-dev (>= 2.2.0-1),
  libbonobo2-dev (>= 2.0.0-1), libbonoboui2-dev (>= 2.0.3-1),
  libbonobo-activation-dev (>= 1.0.3-2.1),
- libgsf-gnome-1-dev (>= 1.7.2-1),
+ libgsf-gnome-1-dev (>= 1.8.1-1),
+ libart-2.0-dev (>= 2.3.11-1),
  python2.2-dev (>= 2.2.1-6),
  libgda2-dev (>= 0.10.0-1)
-Standards-Version: 3.5.8
+Standards-Version: 3.5.10
 
 Package: gnumeric
 Architecture: any
 Depends: ${shlibs:Depends}, gsfonts, gconf2
 Suggests: gnumeric-doc, gnumeric-python, gnumeric-gda, eog
-Conflicts: gnumeric1.0
+Conflicts: gnumeric1.0, gnumeric1.0-doc
 Replaces: zh-trans (<< 0.8-1), gnumeric1.0
 Description: A GNOME spreadsheet application
  Gnumeric is a powerful spreadsheet application that interoperates well
@@ -59,7 +60,7 @@ Architecture: all
 Section: doc
 Suggests: yelp
 Conflicts: gnumeric1.0-doc
-Replaces: gnumeric (<< 1.1.9-2), gnumeric1.0-doc
+Replaces: gnumeric (<< 1.1.17-2), gnumeric1.0-doc
 Description: Documentation for Gnumeric, the GNOME spreadsheet application
  The `Gnumeric's User Manual' in Gnome Help (HTML) format.
 

debian/gnumeric-doc.files

-/usr/share/gnumeric/*/share/gnome/help
+/usr/share/gnumeric/*/gnome/help
 /usr/share/omf/*/*.omf

debian/gnumeric.files

+/etc/gconf/schemas/*
+/usr/bin/gnumeric*
+/usr/lib/bonobo/servers/GNOME_Gnumeric.server
+/usr/lib/gnumeric/*/plugins/*/*.la
+/usr/lib/gnumeric/*/plugins/*/*.so
+/usr/lib/gnumeric/*/plugins/*/*.xml
+/usr/lib/gnumeric/*/plugins/*/*.glade
+/usr/share/applications/gnumeric.desktop
+/usr/share/gnumeric/*/autoformat-templates/*/*.xml
+/usr/share/gnumeric/*/autoformat-templates/*/.category
+/usr/share/gnumeric/*/glade/*.glade
+/usr/share/gnumeric/*/glade/*.png
+/usr/share/gnumeric/*/gnome*/ui/*.xml
+/usr/share/gnumeric/*/idl/*.idl
+/usr/share/gnumeric/*/templates/*.gnumeric
+/usr/share/locale/*/LC_MESSAGES/gnumeric.mo
+/usr/share/mc/templates/gnumeric.desktop
+/usr/share/mime-info/gnumeric.*
+/usr/share/pixmaps/*

debian/gnumeric.mime

-application/x-gnumeric; gnumeric '%s'; description="Gnumeric spreadsheet"; test=test -n "$DISPLAY"; nametemplate=%s.gnumeric
-text/comma-separated-values; gnumeric '%s'; description="Comma Separated Values"; test=test -n "$DISPLAY"; nametemplate=%s.csv
-application/vnd.ms-excel; gnumeric '%s'; description="MS Excel spreadsheet"; test=test -n "$DISPLAY"; nametemplate=%s.xls
-application/x-applix; gnumeric '%s'; description="Applixware Spreadsheets file"; test=test -n "$DISPLAY"; nametemplate=%s.as
+application/x-gnumeric; gnumeric '%s'; edit=gnumeric '%s'; compose=gnumeric '%s'; description="Gnumeric spreadsheet"; test=test -n "$DISPLAY"; nametemplate=%s.gnumeric
+text/comma-separated-values; gnumeric '%s'; edit=gnumeric '%s'; description="Comma Separated Values"; test=test -n "$DISPLAY"; nametemplate=%s.csv
+application/vnd.ms-excel; gnumeric '%s'; edit=gnumeric '%s'; description="MS Excel spreadsheet"; test=test -n "$DISPLAY"; nametemplate=%s.xls
+application/x-applix; gnumeric '%s'; edit=gnumeric '%s'; description="Applixware Spreadsheets file"; test=test -n "$DISPLAY"; nametemplate=%s.as

debian/rules

@@ -8,6 +8,10 @@ export DEB_BUILD_OPTIONS
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+ifeq ($(DEB_BUILD_GNU_TYPE),m68k-linux)
+	DEB_BUILD_OPTIONS+=noopt
+endif
+
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
@@ -33,18 +37,11 @@ features:=
 
 features+= --with-python=python2.2
 
-# Bonobo allows us to use parts of other applications like Guppi and
-# Evolution as components via CORBA, and allows us to work as a component
-# for other applications.
+# Bonobo allows us to use parts of other applications as components via
+# CORBA, and allows us to work as a component for other applications.
 
 features+= --with-bonobo
 
-# File -> Send functionality via Evolution's mail composer component. Note
-# that this is achieved through Bonobo, so no additional library
-# dependencies are introduced.
-
-features+= --with-evolution
-
 # Plugin to access databases through the GDA framework.
 
 features+= --with-gda
@@ -89,14 +86,6 @@ configure-stamp:
 
 	# Prepare for build
 	 
-	# Update our local copy of the Evolution Composer component
-	# interface, if available. 
-	if test -r /usr/share/idl/Evolution-Composer.idl ; then \
-		rm -rf evo && \
-		mkdir evo && \
-		cp /usr/share/idl/Evolution-Composer.idl evo ; \
-	fi
-	
 	mkdir build
 	cd build && env srcdir=`pwd`/.. \
 		../configure $(confflags)
@@ -107,7 +96,7 @@ build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
-	cd build && $(MAKE) EVOLUTION_IDL_DIR=`pwd`/../evo
+	cd build && $(MAKE)
 
 	touch build-stamp
 
@@ -139,7 +128,7 @@ clean:
 	-rm -rf aclocal.m4 config.h.in stamp-h.in autom4te.cache \
 		doc/C/gnumeric.junk
 
-	-rm -f GNOME_Gnumeric.server.in
+	-rm -f GNOME_Gnumeric.server.in GNOME_Gnumeric.server src/gnumeric-paths.h
 
 	dh_clean
 
@@ -152,17 +141,22 @@ install: build
 
 	cd build && env GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
 		$(MAKE) install \
-		prefix=`pwd`/../debian/gnumeric/usr \
-		sysconfdir=`pwd`/../debian/gnumeric/etc \
-		localstatedir=`pwd`/../debian/gnumeric/var/lib \
-		libexecdir=`pwd`/../debian/gnumeric/usr/bin
+		prefix=`pwd`/../debian/tmp/usr \
+		sysconfdir=`pwd`/../debian/tmp/etc \
+		localstatedir=`pwd`/../debian/tmp/var/lib \
+		libexecdir=`pwd`/../debian/tmp/usr/bin
 
 	# Plugins are not intended as stand-alone executables
-	find `pwd`/debian/gnumeric/usr/lib/gnumeric/*/plugins -type f -print0 | xargs -0 chmod a-x
+	find `pwd`/debian/tmp/usr/lib/gnumeric/*/plugins -type f -print0 | xargs -0 chmod a-x
+
+	# Change DTD reference from a URL to a local path for document
+	# registration
+	find `pwd`/debian/tmp -type f -name '*.xml' -exec \
+		perl -i -pe 's,http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd,/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd,' {} \;
 
 	# Remove unwanted files: static libraries and documentation sources
-	find `pwd`/debian/gnumeric/usr/ -name '*.a' -print0 | xargs -0 rm -f
-	find `pwd`/debian/gnumeric/ -name '*.sgml' -print0 | xargs -0 rm -f
+	find `pwd`/debian/tmp/usr/ -name '*.a' -print0 | xargs -0 rm -f
+	find `pwd`/debian/tmp/ -name '*.sgml' -print0 | xargs -0 rm -f
 
 	# We no longer remove the libtool files for plugins as we did for
 	# 1.0.x: 1.1.x actually needs them for the plugins to work.
@@ -170,20 +164,30 @@ install: build
 
 	# Remove scrollkeeper stuff as well, as it should be done at package
 	# (de)install time.
-	rm -rf `pwd`/debian/gnumeric/var/lib/scrollkeeper
+	rm -rf `pwd`/debian/tmp/var/lib/scrollkeeper
 
 	# Low-colour icon for use by the menu system
-	$(INSTALL) -m 644 debian/gnome-gnumeric.xpm `pwd`/debian/gnumeric/usr/share/pixmaps/
+	$(INSTALL) -m 644 debian/gnome-gnumeric.xpm `pwd`/debian/tmp/usr/share/pixmaps/
 
 	# Move files and put in links
-	dh_movefiles --sourcedir=debian/gnumeric
+	dh_movefiles
 	cd debian/gnumeric && \
 		for idl in usr/share/gnumeric/*/idl/*.idl; do \
 			(cd usr/share/idl && ln -s `echo $$idl | sed -e 's,^usr/share,..,'` .); \
 		done
+	cd debian/gnumeric-doc/usr/share/gnumeric/* && \
+		ln -s . share && cd gnome/help/gnumeric/C && \
+		mkdir stylesheet && cd stylesheet && \
+		ln -s ../../../../../../../pixmaps/gnome-logo-icon.png .
 
 	# Clean out empty dirs left over from moving
-	-find `pwd`/debian/gnumeric/ -type d -depth | xargs rmdir 2>&1 >/dev/null
+	for p in `grep '^Package: ' debian/control | sed -e 's/^Package: //'` ; do \
+		find `pwd`/debian/$$p/ -type d -depth | xargs rmdir 2>&1 >/dev/null || true ; \
+	done
+
+	# Ensure there are no files left over with which we haven't dealt with
+	rmdir `find debian/tmp -type d -depth`
+
 
 # Build architecture-independent files here.
 # Pass -i to all debhelper commands in this target to reduce clutter.