~josernestodavila/ubuntu/natty/gnumeric/gnumeric-fix-725292

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Gauvain Pocentek
  • Date: 2009-06-22 13:37:20 UTC
  • mfrom: (1.1.20 upstream) (2.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090622133720-rtdazsiz2lx5q8l7
Tags: 1.9.9-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Promoted gnumeric-doc to Recommends in gnumeric package for help to be
    installed automatically
  - gnumeric-gtk is a transitional package
  - gnumeric conflicts with gnumeric-gtk << 1.8.3-3ubuntu1
  - call initltool-update in po*
  - remove psiconv support (psiconv is in universe):
    o debian/control: remove B-D on libpsiconv-dev
    o debian/rules: don't pass --with-psiconv to ./configure
    o debian/gnumeric-plugins-extra.install: don't install the psiconv
      plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
 
6
6
m4_define([gnumeric_version_epoch], [1])
7
7
m4_define([gnumeric_version_major], [9])
8
 
m4_define([gnumeric_version_minor], [8])
 
8
m4_define([gnumeric_version_minor], [9])
9
9
m4_define([gnumeric_version_extra], [])
10
10
m4_define([gnumeric_version_full],
11
11
    [gnumeric_version_epoch.gnumeric_version_major.gnumeric_version_minor[]gnumeric_version_extra])
141
141
 
142
142
dnl *****************************
143
143
libspreadsheet_reqs="
144
 
        libgoffice-${GOFFICE_API_VER}   >= 0.7.7
145
 
        libgsf-1                >= 1.14.14
 
144
        libgoffice-${GOFFICE_API_VER}   >= 0.7.8
 
145
        libgsf-1                >= 1.14.15
146
146
        libxml-2.0              >= 2.4.12
147
147
"
148
148
gnumeric_reqs="$libspreadsheet_reqs