Commit 247879df authored by J.H.M. Dassen (Ray)'s avatar J.H.M. Dassen (Ray) Committed by Jody Goldberg

introduce EVOLUTION_IDL_DIR to support building with


2002-04-21  J.H.M. Dassen (Ray) <jdassen@debian.org>

	* idl/Makefile.am: introduce EVOLUTION_IDL_DIR to support building
	with Evolution-Composer.idl in a non-standard location.

2001-11-04  J.H.M. Dassen (Ray) <jdassen@debian.org>

	* configure.in: added gdk_pixbuf to the libs considered for
	GNUMERIC_CFLAGS and GNUMERIC_LIBS.

2001-10-27  J.H.M. Dassen (Ray) <jdassen@debian.org>

	* configure.in : Support --with-python=prog consistently: never call
	`python', always call $python_prog.

2001-10-21  J.H.M. Dassen (Ray) <jdassen@debian.org>

	* idl/Makefile.am : Introduced EVOLUTION_IDL_DIR to make it possible
	  to use Evolution-Composer.idl from a non-standard location.

2001-11-04  J.H.M. Dassen (Ray) <jdassen@debian.org>

	* configure.in: added gdk_pixbuf to the libs considered for
	GNUMERIC_CFLAGS and GNUMERIC_LIBS.
parent 597d2ec0
2002-04-21 J.H.M. Dassen (Ray) <jdassen@debian.org>
* idl/Makefile.am: introduce EVOLUTION_IDL_DIR to support building
with Evolution-Composer.idl in a non-standard location.
2001-11-04 J.H.M. Dassen (Ray) <jdassen@debian.org>
* configure.in: added gdk_pixbuf to the libs considered for
GNUMERIC_CFLAGS and GNUMERIC_LIBS.
2001-10-27 J.H.M. Dassen (Ray) <jdassen@debian.org>
* configure.in : Support --with-python=prog consistently: never call
`python', always call $python_prog.
2001-10-21 J.H.M. Dassen (Ray) <jdassen@debian.org>
* idl/Makefile.am : Introduced EVOLUTION_IDL_DIR to make it possible
to use Evolution-Composer.idl from a non-standard location.
2001-11-04 J.H.M. Dassen (Ray) <jdassen@debian.org>
* configure.in: added gdk_pixbuf to the libs considered for
GNUMERIC_CFLAGS and GNUMERIC_LIBS.
2002-04-22 Morten Welinder <terra@diku.dk>
* src/value.c (criteria_test_equal, criteria_test_unequal,
......
2002-04-21 J.H.M. Dassen (Ray) <jdassen@debian.org>
* idl/Makefile.am: introduce EVOLUTION_IDL_DIR to support building
with Evolution-Composer.idl in a non-standard location.
2001-11-04 J.H.M. Dassen (Ray) <jdassen@debian.org>
* configure.in: added gdk_pixbuf to the libs considered for
GNUMERIC_CFLAGS and GNUMERIC_LIBS.
2001-10-27 J.H.M. Dassen (Ray) <jdassen@debian.org>
* configure.in : Support --with-python=prog consistently: never call
`python', always call $python_prog.
2001-10-21 J.H.M. Dassen (Ray) <jdassen@debian.org>
* idl/Makefile.am : Introduced EVOLUTION_IDL_DIR to make it possible
to use Evolution-Composer.idl from a non-standard location.
2001-11-04 J.H.M. Dassen (Ray) <jdassen@debian.org>
* configure.in: added gdk_pixbuf to the libs considered for
GNUMERIC_CFLAGS and GNUMERIC_LIBS.
2002-04-22 Morten Welinder <terra@diku.dk>
* src/value.c (criteria_test_equal, criteria_test_unequal,
......
2002-04-21 J.H.M. Dassen (Ray) <jdassen@debian.org>
* idl/Makefile.am: introduce EVOLUTION_IDL_DIR to support building
with Evolution-Composer.idl in a non-standard location.
2001-11-04 J.H.M. Dassen (Ray) <jdassen@debian.org>
* configure.in: added gdk_pixbuf to the libs considered for
GNUMERIC_CFLAGS and GNUMERIC_LIBS.
2001-10-27 J.H.M. Dassen (Ray) <jdassen@debian.org>
* configure.in : Support --with-python=prog consistently: never call
`python', always call $python_prog.
2001-10-21 J.H.M. Dassen (Ray) <jdassen@debian.org>
* idl/Makefile.am : Introduced EVOLUTION_IDL_DIR to make it possible
to use Evolution-Composer.idl from a non-standard location.
2001-11-04 J.H.M. Dassen (Ray) <jdassen@debian.org>
* configure.in: added gdk_pixbuf to the libs considered for
GNUMERIC_CFLAGS and GNUMERIC_LIBS.
2002-04-22 Morten Welinder <terra@diku.dk>
* src/value.c (criteria_test_equal, criteria_test_unequal,
......
......@@ -446,10 +446,10 @@ if $try_python; then
python_val=
AC_CHECK_PROG(python_val, "$python_prog", true, false)
if $python_val; then
PY_PREFIX=`python -c 'import sys ; print sys.prefix'`
PY_EXEC_PREFIX=`python -c 'import sys ; print sys.exec_prefix'`
PY_PREFIX=`$python_prog -c 'import sys ; print sys.prefix'`
PY_EXEC_PREFIX=`$python_prg -c 'import sys ; print sys.exec_prefix'`
changequote(<<, >>)dnl
PY_VERSION=`python -c 'import sys ; print sys.version[0:3]'`
PY_VERSION=`$python_prog -c 'import sys ; print sys.version[0:3]'`
changequote([, ])dnl
if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then
PY_LIBS="python$PY_VERSION"
......@@ -565,6 +565,11 @@ AC_ARG_WITH(evolution,
if test x"$have_bonobo" = "xtrue" -a x"$try_evolution" = "xtrue" ; then
path_to_composer_idl=`pkg-config --datadir`/idl/Evolution-Composer.idl
AC_CHECK_FILE($path_to_composer_idl, evolution=yes, evolution=no)
if test x"$evolution" = "xno" ; then
echo "Debian build hack: enabling Evolution support anyway;"
echo "be sure to set EVOLUTION_IDL_DIR to a dir containing Evolution-Composer.idl"
evolution=yes
fi
fi
AM_CONDITIONAL(ENABLE_EVOLUTION, test x"$evolution" = "xyes")
if test x"$evolution" = "xyes" ; then
......@@ -611,6 +616,30 @@ dnl ====================================
dnl = End tests for jw
dnl ====================================
dnl Implement Debian policy on building with debugging info and on stripping.
echo "Debian build policy: "
echo -n " * "
case $DEB_BUILD_OPTIONS in
*debug*) echo -n "Will "
;;
*) echo -n "Will not "
CFLAGS=`echo $CFLAGS | sed -e 's/-g\>//'`
;;
esac
echo "include debug info in objects."
echo -n " * "
case $DEB_BUILD_OPTIONS in
*nostrip*) echo -n "Will not "
INSTALL_STRIP_PROGRAM=`echo $INSTALL_STRIP_PROGRAM | sed -e 's/-s\>//'`
STRIP=/bin/true
;;
*) echo -n "Will "
;;
esac
echo "strip on install."
#echo "CFLAGS is: $CFLAGS"
#echo "INSTALL_STRIP_PROGRAM is: $INSTALL_STRIP_PROGRAM"
#echo "STRIP is: $STRIP"
AC_OUTPUT([
gnumeric.spec
......
gnumeric (1.1.0-0) unstable; urgency=high
gnumeric (1.1.2-1) experimental; urgency=low
* New upstream release
* Updated debianization for new gnumeric version.
* UNRELEASED
-- C. Scott Ananian <cananian@alumni.princeton.edu> Tue, 19 Feb 2002 15:33:03 +0500
* Development version based on upstream CVS HEAD.
* TODO
* Port gda plugin fixes ?
-- J.H.M. Dassen (Ray) <jdassen@debian.org> Sun, 21 Apr 2002 15:13:22 +0200
gnumeric (1.0.6-1) unstable; urgency=high
* New upstream maintenance release.
* urgency high to have a chance of getting it into woody; in the current
version in woody, multi-line entry is still broken (#140522).
-- J.H.M. Dassen (Ray) <jdassen@debian.org> Sun, 14 Apr 2002 17:37:29 +0200
gnumeric (1.0.5-4) unstable; urgency=medium
* Added icon to the menu entry, courtesy of Ben Burton <benb@acm.org>.
(Closes: #140869)
-- J.H.M. Dassen (Ray) <jdassen@debian.org> Wed, 3 Apr 2002 20:55:40 +0200
gnumeric (1.0.5-3) unstable; urgency=medium
* Packaged the GDA plugin now that GDA has gone into main. (Closes: #129056)
* [plugins/gda/ChangeLog, plugins/gda/plugin-gda.c] Minor changes to get the
GDA plugin to build.
-- J.H.M. Dassen (Ray) <jdassen@debian.org> Fri, 29 Mar 2002 17:01:29 +0100
gnumeric (1.0.5-2) unstable; urgency=medium
* Moved the OMF file to the -doc package.
* Handle scrollkeeper documentation (de)registration the right way, i.e.
at package (de)installion time rather than at package build time.
(Closes: #138079)
-- J.H.M. Dassen (Ray) <jdassen@debian.org> Wed, 13 Mar 2002 12:18:06 +0100
gnumeric (1.0.5-1) unstable; urgency=medium
* New upstream release. (Closes: #130224)
* Don't include SGML sources in the -doc package.
* Added SGML files from CVS (gnome_1_4 branch) that appear to have been left
out of the upstream tarball accidentally.
* Made the scrollkeeper stuff work.
* Fixed lintian warnings about python plugins code files being marked
executable.
-- J.H.M. Dassen (Ray) <jdassen@debian.org> Sun, 10 Mar 2002 14:57:49 +0100
gnumeric (1.0.4-2) unstable; urgency=medium
* Actually register as a MIME handler. (Closes: #135178).
* Added a README.Debian to point to related packages, as many users do not
notice Suggests: dependencies.
-- J.H.M. Dassen (Ray) <jdassen@debian.org> Fri, 22 Feb 2002 14:32:22 +0100
gnumeric (1.0.4-1) unstable; urgency=high
......
......@@ -2,13 +2,13 @@ Source: gnumeric
Section: math
Priority: optional
Maintainer: J.H.M. Dassen (Ray) <jdassen@debian.org>
Build-Depends: debhelper (>= 3.0), libtool, automake (>= 1.4-p4-1), autoconf (>= 2.52), gettext, bison, flex, docbook-utils, intltool, libglib1.3-dev (>= 1.3.14), libgtk1.3-dev (>= 1.3.14), libgnome2-dev (>= 1.105.0), libgnomeui-dev (>= 1.106.0), libgnomeprint2-dev (>= 1.106.0), libgnomeprintui-dev (>= 1.106.0), libgnomecanvas2-dev (>= 1.110.0), libglade2-dev (>= 1.99.7), libxml2-dev (>= 2.4.12), libgal-dev (>= 0.19), libole2-dev (>= 0.2.4), libbonobo-dev (>= 1.0.9), python2.2-dev (>= 2.2-1), gnome-doc-tools
Build-Depends: debhelper (>= 3.0), libtool, automake (>= 1.4-p4-1), autoconf (>= 2.52), gettext, bison, flex, docbook-utils, intltool, libglib2.0-dev, libgtk2.0-dev, gnome-common, libxslt1-dev, libgnome2-dev (>= 1.105.0-1), liborbit2-dev (>= 2.3.102-2), libgnomeui-dev (>= 1.106.0-1), libgnomeprint2-dev (>= 1.106.0-1), libgnomeprintui-dev (>= 1.106.0-1), libglade2-dev (>= 1.99.4-1), libgal2-0-dev, libxml2-dev (>= 2.4.12-1), libole2-dev (>= 0.2.0), libgda2-dev, python2.2-dev (>= 2.2-1), gnome-doc-tools
Standards-Version: 3.5.6
Package: gnumeric
Architecture: any
Depends: ${shlibs:Depends}, gsfonts, gnome-libs-data (>= 1.4.1.2-6)
Suggests: gnumeric-doc, gnumeric-python, eog, guppi-gnumeric, evolution
Depends: ${shlibs:Depends}, gsfonts
Suggests: gnumeric-doc, gnumeric-python, gnumeric-gda, eog, guppi-gnumeric, evolution
Replaces: zh-trans (<< 0.8-1)
Description: A GNOME spreadsheet application
Gnumeric is a powerful spreadsheet application that interoperates well
......@@ -37,6 +37,7 @@ Description: A GNOME spreadsheet application
Package: gnumeric-doc
Architecture: all
Suggests: gnome-help
Replaces: gnumeric (<= 1.0.5-1)
Description: Documentation for Gnumeric, the GNOME spreadsheet application
The `Gnumeric's User Manual' in Gnome Help (HTML) format.
......@@ -50,3 +51,10 @@ Description: Python plugins for the GNOME spreadsheet
o Python plugin loader
o Python functions
o Gnome glossary
Package: gnumeric-gda
Architecture: any
Depends: gnumeric (= ${Source-Version}), ${shlibs:Depends}
Description: Database access plugin for the GNOME spreadsheet
A plugin to let Gnumeric access databases through the GNU Data Access
framework.
/usr/share/doc/gnumeric-doc/
/usr/share/gnome/help/
/usr/share/omf
/usr/share/gnome/help/
/usr/share/omf/
......@@ -2,3 +2,4 @@ usr/bin
usr/lib
usr/share/man/man1
usr/share/idl
var/lib/scrollkeeper
?package(gnumeric):needs=X11 section=Apps/Math hints="Gnome,Spreadsheets" \
title="gnumeric" command="/usr/bin/gnumeric"
title="gnumeric" command="/usr/bin/gnumeric" \
icon="/usr/share/pixmaps/gnome-gnumeric.xpm"
......@@ -14,6 +14,51 @@ export DH_COMPAT=3
# Try to preserve timestamps as much as possible
export INSTALL=/usr/bin/install -p
# Features configuration
# ----------------------
#
# We're aiming for a package that's stable, with as much
# functionality as is reasonably possible.
features:=
# The Python support offers a nice way to extend gnumeric's functionality.
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.
#
# The bonobo support is currently disabled while the GNOME2 port is being
# worked on
features+= --without-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
# Guile offers an additional way to extension gnumeric, but the guile
# support is for guile 1.5 or newer, which is not currently available in
# Debian.
features+= --without-guile
# 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
configure: configure-stamp
configure-stamp:
dh_testdir
......@@ -28,43 +73,12 @@ configure-stamp:
cp /usr/share/idl/Evolution-Composer.idl evo ; \
fi
# Configuration motivation
# ------------------------
#
# We're aiming for a package that's stable, with as much
# functionality as is reasonably possible.
#
# --with-python: The Python support offers a nice way to extend
# gnumeric's functionality.
#
# --with-bonobo: 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.
# XXXX bonobo support doesn't seem to be working yet.
# --with-evolution: Enables File -> Send functionality via
# Evolution's mail composer component. Note that this is achieved
# through Bonobo, so no additional library dependencies are
# introduced.
#
# --without-guile: Guile offers an additional way to extension
# gnumeric, but the guile support is for guile 1.5 or newer, which
# is not currently available in Debian.
#
# --without-gb: 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."
#
# --without-gda: enabling the GDA plugin would mean putting gnumeric
# in non-US as libgda-dev is in non-US. Let's wait until crypto in main
# is realised technically.
mkdir build
cd build && env srcdir=`pwd`/.. \
sh ../autogen.sh \
$(features) \
--prefix=/usr --sysconfdir=/etc \
--with-python=python2.2 \
--without-bonobo --without-evolution \
--without-guile --without-gb --without-gda \
--localstatedir=/var/lib \
--enable-compile-warnings=minimum \
--enable-iso-c
......@@ -74,8 +88,6 @@ build: configure-stamp build-stamp
build-stamp:
dh_testdir
# Add here commands to compile the package.
#cd build && $(MAKE)
cd build && $(MAKE) EVOLUTION_IDL_DIR=`pwd`/../evo
touch build-stamp
......@@ -95,9 +107,8 @@ clean:
-rm -f po/*.gmo
# Clean out files generated as part of the documentation generation
-rm -f doc/C/index.html
-rm -rf doc/C/gnumeric
-rm -rf doc/C/DBTOHTML_OUTPUT_DIR*
-rm -f doc/C/index.html omf-install/gnumeric-C.omf
-rm -rf doc/C/gnumeric doc/C/DBTOHTML_OUTPUT_DIR*
-rm -rf aclocal.m4 config.h.in configure stamp-h.in \
xml-i18n-extract* xml-i18n-merge* xml-i18n-update* \
......@@ -111,26 +122,40 @@ install: build
dh_clean -k
dh_installdirs
cd build && $(MAKE) install prefix=`pwd`/../debian/gnumeric/usr sysconfdir=`pwd`/../debian/gnumeric/etc
cd build && $(MAKE) install \
prefix=`pwd`/../debian/gnumeric/usr \
sysconfdir=`pwd`/../debian/gnumeric/etc \
localstatedir=`pwd`/../debian/gnumeric/var/lib
# Plugins are not intended as stand-alone executables
find `pwd`/debian/gnumeric/usr/lib/gnumeric/*/plugins -type f -print0 | xargs -0 chmod a-x
# Remove unwanted files: static libraries, libtool files for plugins
# and documentation sources
find `pwd`/debian/gnumeric/usr/ -name '*.a' -print0 | xargs -0 rm -f
find `pwd`/debian/gnumeric/usr/lib/gnumeric/*/plugins -name '*.la' -print0 | xargs -0 rm -f
find `pwd`/debian/gnumeric/ -name '*.sgml' -print0 | xargs -0 rm -f
dh_movefiles --sourcedir=debian/gnumeric
# Remove scrollkeeper stuff as well, as it should be done at package
# (de)install time.
rm -rf `pwd`/debian/gnumeric/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/
# Move files and put in links
dh_movefiles --sourcedir=debian/gnumeric
mv `pwd`/debian/gnumeric-doc/usr/share/gnome/help/gnumeric \
`pwd`/debian/gnumeric-doc/usr/share/doc/gnumeric-doc/html
cd `pwd`/debian/gnumeric-doc/usr/share/gnome/help && \
ln -s ../../doc/gnumeric-doc/html/ gnumeric
DATADIR=`build/src/gnumeric -v | awk '/datadir/{ print $3; }' | sed -e "s/'//g"` && \
cd debian/gnumeric && \
for idl in $$DATADIR/idl/*.idl; do \
(cd usr/share/idl && ln -s `echo $$idl | sed -e 's,^/usr/share,..,'` .); \
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
# Clean out empty dirs left over from moving
-find `pwd`/debian/gnumeric/ -type d -depth | xargs rmdir
-find `pwd`/debian/gnumeric/ -type d -depth | xargs rmdir 2>&1 >/dev/null
# Build architecture-independent files here.
# Pass -i to all debhelper commands in this target to reduce clutter.
......@@ -172,7 +197,7 @@ binary-arch: build install
# dh_installlogrotate -a
# dh_installemacsen -a
# dh_installpam -a
# dh_installmime -a
dh_installmime -a
# dh_installinit -a
dh_installcron -a
dh_installman -a
......
......@@ -6,8 +6,6 @@
* please see bonobo/samples/ for a better starting point.
*/
#include <Bonobo.idl>
module GNOME {
module Gnumeric {
interface Sheet {
......@@ -17,11 +15,10 @@ module GNOME {
attribute string name;
};
interface Application {
Workbook new_workbook ();
Workbook open_workbook (in string file);
Workbook workbook_new ();
Workbook workbook_open (in string file_name);
};
};
};
#endif /* __GNUMERIC_IDL__ */
......@@ -43,8 +43,9 @@ stamp_Gnumeric_Graph_idl : $(srcdir)/GNOME_Gnumeric_Graph.idl
$(GNUMERIC_GRAPH_GENERATED): stamp_Gnumeric_Graph_idl
if ENABLE_EVOLUTION
EVOLUTION_IDL_DIR = $(shell $(GNOME_CONFIG) --datadir)/idl
stamp_evolution_idl :
$(ORBIT_IDL) `$(GNOME_CONFIG) --datadir`/idl/Evolution-Composer.idl && touch $@
$(ORBIT_IDL) `$(EVOLUTION_IDL_DIR)/idl/Evolution-Composer.idl && touch $@
$(EVOLUTION_GENERATED) : stamp_evolution_idl
......
2002-04-21 J.H.M. Dassen (Ray) <jdassen@debian.org>
* Makefile.am: Added `-I..' to INCLUDES so gnm-marshalers.h is found
when building in a separate builddir.
2002-04-15 Morten Welinder <terra@diku.dk>
* *.c: Include <gnumeric-config.h> as needed.
......
......@@ -3,6 +3,7 @@ INCLUDES = \
-DGNUMERIC_GLADEDIR=\""$(gnumeric_gladedir)"\" \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I.. \
$(GNUMERIC_CFLAGS)
noinst_LIBRARIES = libwidgets.a
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment