diff -Nru gnumeric-1.10.5/debian/changelog gnumeric-1.10.5/debian/changelog --- gnumeric-1.10.5/debian/changelog 2010-06-01 08:39:09.000000000 +0200 +++ gnumeric-1.10.5/debian/changelog 2010-06-02 23:54:19.000000000 +0200 @@ -1,3 +1,12 @@ +gnumeric (1.10.5-1ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #588664), remaining changes: + - Promoted gnumeric-doc to Recommends in gnumeric package for help to be + installed automatically. + - call intltool-update in po*. + + -- Lorenzo De Liso Wed, 02 Jun 2010 23:46:56 +0200 + gnumeric (1.10.5-1) unstable; urgency=low * New upstream stable release. @@ -5,6 +14,15 @@ -- J.H.M. Dassen (Ray) Tue, 01 Jun 2010 08:39:08 +0200 +gnumeric (1.10.4-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable, remaining changes: + - Promoted gnumeric-doc to Recommends in gnumeric package for help to be + installed automatically. + - call intltool-update in po*. + + -- Lionel Le Folgoc Sun, 23 May 2010 17:03:44 +0200 + gnumeric (1.10.4-1) unstable; urgency=low * New upstream stable release. @@ -24,6 +42,27 @@ -- J.H.M. Dassen (Ray) Sat, 17 Apr 2010 11:45:12 +0200 +gnumeric (1.10.1-1ubuntu1) lucid; urgency=low + + * FFe granted, upload to ubuntu. lp: #542021, #543612 + + -- Lionel Le Folgoc Sun, 21 Mar 2010 23:51:56 +0100 + +gnumeric (1.10.1-1ubuntu1~ppa1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - Promoted gnumeric-doc to Recommends in gnumeric package for help to be + installed automatically. + - Add transitional gnumeric-gtk package: + + debian/control: Add package. + + gnumeric conflicts with gnumeric-gtk << 1.8.3-3ubuntu1 + + Needs to be kept until after lucid's release for LTS→LTS upgrades. + + lintian errors regarding gnumeric-gtk can be ignored due to it being + a transitional package. + - call intltool-update in po*. + + -- Lionel Le Folgoc Sat, 20 Mar 2010 16:29:52 +0100 + gnumeric (1.10.1-1) unstable; urgency=low * New upstream stable release. @@ -32,6 +71,32 @@ -- J.H.M. Dassen (Ray) Tue, 09 Mar 2010 21:45:03 +0100 +gnumeric (1.10.0-1ubuntu2) lucid; urgency=low + + * Rebuild to include translations, since it has been demoted to universe. + + -- Lionel Le Folgoc Sun, 14 Mar 2010 17:45:01 +0100 + +gnumeric (1.10.0-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - Promoted gnumeric-doc to Recommends in gnumeric package for help to be + installed automatically. + - Add transitional gnumeric-gtk package: + + debian/control: Add package. + + gnumeric conflicts with gnumeric-gtk << 1.8.3-3ubuntu1 + + Needs to be kept until after lucid's release for LTS→LTS upgrades. + + lintian errors regarding gnumeric-gtk can be ignored due to it being + a transitional package. + - call intltool-update in po* + - remove psiconv support (psiconv is in universe): + + debian/control: remove B-D on libpsiconv-dev + + debian/rules: don't pass --with-psiconv to ./configure + + debian/gnumeric-plugins-extra.install: don't install the psiconv + plugin + + -- Daniel T Chen Thu, 18 Feb 2010 01:37:12 -0500 + gnumeric (1.10.0-1) unstable; urgency=low * New upstream stable release. @@ -41,6 +106,26 @@ -- J.H.M. Dassen (Ray) Mon, 15 Feb 2010 13:59:38 +0100 +gnumeric (1.9.18-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable, remaining changes: + - Promoted gnumeric-doc to Recommends in gnumeric package for help to be + installed automatically. + - Add transitional gnumeric-gtk package: + + debian/control: Add package. + + gnumeric conflicts with gnumeric-gtk << 1.8.3-3ubuntu1 + + Needs to be kept until after lucid's release for LTS→LTS upgrades. + + lintian errors regarding gnumeric-gtk can be ignored due to it being + a transitional package. + - call intltool-update in po* + - remove psiconv support (psiconv is in universe): + + debian/control: remove B-D on libpsiconv-dev + + debian/rules: don't pass --with-psiconv to ./configure + + debian/gnumeric-plugins-extra.install: don't install the psiconv + plugin + + -- Daniel T Chen Wed, 10 Feb 2010 00:08:05 -0500 + gnumeric (1.9.18-1) unstable; urgency=low * New upstream release. Upstream development is now in a "code slush" @@ -48,6 +133,26 @@ -- J.H.M. Dassen (Ray) Tue, 26 Jan 2010 21:19:45 +0100 +gnumeric (1.9.17-1ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining changes: + - Promoted gnumeric-doc to Recommends in gnumeric package for help to be + installed automatically. + - Add transitional gnumeric-gtk package: + + debian/control: Add package. + + gnumeric conflicts with gnumeric-gtk << 1.8.3-3ubuntu1 + + Needs to be kept until after lucid's release for LTS→LTS upgrades. + + lintian errors regarding gnumeric-gtk can be ignored due to it being + a transitional package. + - call initltool-update in po* + - remove psiconv support (psiconv is in universe): + + debian/control: remove B-D on libpsiconv-dev + + debian/rules: don't pass --with-psiconv to ./configure + + debian/gnumeric-plugins-extra.install: don't install the psiconv + plugin + + -- Daniel T Chen Sun, 10 Jan 2010 17:14:27 -0500 + gnumeric (1.9.17-1) unstable; urgency=low * New upstream release. Changes include: @@ -79,6 +184,24 @@ -- J.H.M. Dassen (Ray) Tue, 03 Nov 2009 13:32:32 +0100 +gnumeric (1.9.14-2ubuntu1) lucid; urgency=low + + * Merge from Debian testing. Remaining Ubuntu changes: + - Promoted gnumeric-doc to Recommends in gnumeric package for help to be + installed automatically. + - Add transitional gnumeric-gtk package: + + debian/control: Add package. + + gnumeric conflicts with gnumeric-gtk << 1.8.3-3ubuntu1 + + Needs to be kept until after lucid's release for LTS→LTS upgrades. + - call initltool-update in po* + - remove psiconv support (psiconv is in universe): + + debian/control: remove B-D on libpsiconv-dev + + debian/rules: don't pass --with-psiconv to ./configure + + debian/gnumeric-plugins-extra.install: don't install the psiconv + plugin + + -- Martin Pitt Mon, 09 Nov 2009 16:05:34 +0100 + gnumeric (1.9.14-2) unstable; urgency=low * Uploading to unstable now that 1.9.13 has migrated to testing. @@ -163,6 +286,31 @@ -- J.H.M. Dassen (Ray) Thu, 13 Aug 2009 19:49:05 +0200 +gnumeric (1.9.9-1ubuntu2) karmic; urgency=low + + * src/dialogs/dialog-stf-preview.c: Replace usage of deprecated + gtk_tree_view_column_get_cell_renderers() with + gtk_cell_layout_get_cells() to avoid bad compilation due to missing + prototypes. Patch backported from 1.9.10. (LP: #402175) + + -- Martin Pitt Tue, 15 Sep 2009 12:14:45 +0200 + +gnumeric (1.9.9-1ubuntu1) karmic; urgency=low + + * 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 + + -- Gauvain Pocentek Mon, 22 Jun 2009 13:37:20 +0200 + gnumeric (1.9.9-1) unstable; urgency=low * New upstream development release. diff -Nru gnumeric-1.10.5/debian/control gnumeric-1.10.5/debian/control --- gnumeric-1.10.5/debian/control 2010-06-01 08:38:42.000000000 +0200 +++ gnumeric-1.10.5/debian/control 2010-06-03 00:07:09.000000000 +0200 @@ -1,7 +1,8 @@ Source: gnumeric Section: math Priority: optional -Maintainer: J.H.M. Dassen (Ray) +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: J.H.M. Dassen (Ray) Build-Depends: debhelper (>= 7.0.0), python-central (>= 0.5), dh-buildinfo, po-debconf, gettext, bison, flex, rarian-compat | scrollkeeper, intltool (>= 0.29), libxml-parser-perl, @@ -20,8 +21,8 @@ Package: gnumeric Architecture: any Depends: ${shlibs:Depends}, procps, gsfonts, gnumeric-common (= ${source:Version}), ${misc:Depends} -Recommends: evince (>= 0.9.0) | evince-gtk (>= 0.9.0), lp-solve -Suggests: gnumeric-doc (>= ${Upstream-Version}), gnumeric-plugins-extra, epiphany-browser, ttf-liberation | ttf-mscorefonts-installer +Recommends: evince (>= 0.9.0) | evince-gtk (>= 0.9.0), lp-solve, gnumeric-doc (>= ${Upstream-Version}) +Suggests: gnumeric-plugins-extra, epiphany-browser, ttf-liberation | ttf-mscorefonts-installer Conflicts: gnumeric1.0, gnumeric1.0-doc, gnumeric-doc (<< ${Upstream-Version}) Replaces: zh-trans (<< 0.8-1), gnumeric1.0 XS-Python-Version: current diff -Nru gnumeric-1.10.5/debian/rules gnumeric-1.10.5/debian/rules --- gnumeric-1.10.5/debian/rules 2009-11-29 22:29:24.000000000 +0100 +++ gnumeric-1.10.5/debian/rules 2010-06-02 23:58:31.000000000 +0200 @@ -106,6 +106,9 @@ configure-stamp: dh_testdir + cd po; intltool-update -p + cd po-functions; intltool-update -p + # Prepare for build mkdir build