GNOME.org
 

[gnumeric] Updated debianisation

commit 523194226c4da2976ce64ec2f8d919dd8d32141f
Author: J.H.M. Dassen (Ray) <jdassen debian org>
Date:   Sat Mar 26 13:46:36 2011 +0100

    Updated debianisation

 debian/changelog                                   |   18 ++++++++++++
 debian/control                                     |   11 ++----
 debian/gnumeric-common.install                     |    1 +
 debian/gnumeric-plugins-extra.install              |    2 +-
 ....10.13-1 => refresh-config-sub-guess-1.10.14-1} |   12 ++++----
 debian/patches/series                              |    2 +-
 debian/po/ja.po                                    |   29 ++++++++-----------
 debian/po/pt_BR.po                                 |   30 ++++++++-----------
 debian/rules                                       |   16 ++++------
 9 files changed, 62 insertions(+), 59 deletions(-)
---
diff --git a/debian/changelog b/debian/changelog
index f783a58..2e1b6c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+gnumeric (1.10.14-1) unstable; urgency=low
+
+  * New upstream stable release. Changes include
+    * Improve "dif" output. (Closes: #616152)
+  * [debian/control, debian/rules, debian/pycompat] Convert from
+    python-central to dh_python2. (Closes: #616831)
+  * [debian/control, debian/rules, gnumeric-plugins-extra.install] Removed
+    psiconv support. Psion file support is a fairly obscure feature and
+    should not block gnumeric packages from entering testing.
+  * [debian/control] Cleanup: there is no --with-gnomedb option any more.
+  * [debian/gnumeric-common.install] Install GSettings schemas.
+  * [debian/po/ja.po] Updated, courtesy of Nobuhiro Iwamatsu
+    <iwamatsu nigauri org>. (Closes: #611051)
+  * [debian/po/pt_BR.po] Updated, courtesy of Eder L. Marques
+    <eder edermarques net>. (Closes: #619607)
+
+ -- J.H.M. Dassen (Ray) <jdassen debian org>  Sat, 26 Mar 2011 11:52:00 +0100
+
 gnumeric (1.10.13-1) unstable; urgency=low
 
   * New upstream stable release.
diff --git a/debian/control b/debian/control
index 7dcf183..a82d14f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,16 @@ Source: gnumeric
 Section: math
 Priority: optional
 Maintainer: J.H.M. Dassen (Ray) <jdassen debian org>
-Build-Depends: debhelper (>= 7.0.0), python-central (>= 0.5), dh-buildinfo, 
+Build-Depends: debhelper (>= 7.0.0), dh-buildinfo, 
  po-debconf, gettext, bison, flex, rarian-compat | scrollkeeper,
  intltool (>= 0.29), libxml-parser-perl,
  zlib1g-dev, libglib2.0-dev (>= 2.12.0), libgsf-1-dev (>= 1.14.18),
  libgoffice-0.8-dev (>= 0.8.10), libxml2-dev (>= 2.6.10-2),
  libpango1.0-dev (>= 1.12.0),
  libgtk2.0-dev (>= 2.12.0), libart-2.0-dev (>= 2.3.16-5),
- pxlib-dev (>= 0.5.1-2+b1), libpsiconv-dev (>= 0.9.8-2), libperl-dev,
- python-dev, python-gtk2-dev, python-gobject-dev
+ pxlib-dev (>= 0.5.1-2+b1), libperl-dev,
+ python-dev (>= 2.6.6-3), python-gtk2-dev, python-gobject-dev
+X-Python-Version: >= 2.5
 Homepage: http://www.gnumeric.org/
 Vcs-git: git://git.gnome.org/gnumeric
 Vcs-Browser: http://git.gnome.org/cgit/gnumeric
@@ -25,8 +26,6 @@ Suggests: gnumeric-doc (>= ${Upstream-Version}), gnumeric-plugins-extra,
  epiphany-browser, ttf-liberation | ttf-mscorefonts-installer
 Breaks: gnumeric1.0, gnumeric1.0-doc, gnumeric-doc (<< ${Upstream-Version})
 Replaces: zh-trans (<< 0.8-1), gnumeric1.0
-XS-Python-Version: current
-XB-Python-Version: ${python:Versions}
 Description: spreadsheet application for GNOME - main program
  Gnumeric is a spreadsheet application that interoperates well
  with other spreadsheets. It comes with plugins that enable it to deal with
@@ -94,8 +93,6 @@ Depends: gnumeric (= ${binary:Version}), python-gtk2, ${python:Depends},
 Breaks: 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)
-XS-Python-Version: current
-XB-Python-Version: ${python:Versions}
 Description: spreadsheet application for GNOME - additional plugins
  Gnumeric is a spreadsheet application that interoperates well
  with other spreadsheets. It comes with plugins that enable it to deal with
diff --git a/debian/gnumeric-common.install b/debian/gnumeric-common.install
index 64361bd..9775f89 100644
--- a/debian/gnumeric-common.install
+++ b/debian/gnumeric-common.install
@@ -10,3 +10,4 @@
 # /usr/share/mime-info/gnumeric.*
 /usr/share/pixmaps/*
 /usr/share/icons/
+/usr/share/glib-*/schemas/org.gnome.gnumeric.*.xml
diff --git a/debian/gnumeric-plugins-extra.install b/debian/gnumeric-plugins-extra.install
index f40ad6c..f7031ac 100644
--- a/debian/gnumeric-plugins-extra.install
+++ b/debian/gnumeric-plugins-extra.install
@@ -3,7 +3,7 @@
 /usr/lib/gnumeric/*/plugins/gnome-glossary/*
 /usr/lib/gnumeric/*/plugins/paradox/*
 /usr/lib/gnumeric/*/plugins/perl*/*
-/usr/lib/gnumeric/*/plugins/psiconv/*
+#/usr/lib/gnumeric/*/plugins/psiconv/*
 /usr/lib/gnumeric/*/plugins/py-func/*
 /usr/lib/gnumeric/*/plugins/python-loader/*
 # /usr/lib/gnumeric/*/plugins/python/*
diff --git a/debian/patches/refresh-config-sub-guess-1.10.13-1 b/debian/patches/refresh-config-sub-guess-1.10.14-1
similarity index 97%
rename from debian/patches/refresh-config-sub-guess-1.10.13-1
rename to debian/patches/refresh-config-sub-guess-1.10.14-1
index 215e9bf..dd33d21 100644
--- a/debian/patches/refresh-config-sub-guess-1.10.13-1
+++ b/debian/patches/refresh-config-sub-guess-1.10.14-1
@@ -1,6 +1,6 @@
-diff -ru gnumeric-1.10.13.old/config.guess gnumeric-1.10.13/config.guess
---- gnumeric-1.10.13.old/config.guess	2010-11-26 01:12:57.000000000 +0100
-+++ gnumeric-1.10.13/config.guess	2011-02-03 20:09:56.000000000 +0100
+diff -ru gnumeric-1.10.14.orig/config.guess gnumeric-1.10.14/config.guess
+--- gnumeric-1.10.14.orig/config.guess	2011-03-25 00:25:29.000000000 +0100
++++ gnumeric-1.10.14/config.guess	2011-03-26 10:45:10.000000000 +0100
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -409,9 +409,9 @@ diff -ru gnumeric-1.10.13.old/config.guess gnumeric-1.10.13/config.guess
  	exit ;;
      *:*VMS:*:*)
      	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-diff -ru gnumeric-1.10.13.old/config.sub gnumeric-1.10.13/config.sub
---- gnumeric-1.10.13.old/config.sub	2010-11-26 01:12:57.000000000 +0100
-+++ gnumeric-1.10.13/config.sub	2011-02-03 20:09:56.000000000 +0100
+diff -ru gnumeric-1.10.14.orig/config.sub gnumeric-1.10.14/config.sub
+--- gnumeric-1.10.14.orig/config.sub	2011-03-25 00:25:29.000000000 +0100
++++ gnumeric-1.10.14/config.sub	2011-03-26 10:45:10.000000000 +0100
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
diff --git a/debian/patches/series b/debian/patches/series
index 567b271..66a56eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-refresh-config-sub-guess-1.10.13-1
+refresh-config-sub-guess-1.10.14-1
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 766d600..7fb32b3 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -1,26 +1,27 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL ADDRESS>, YEAR.
+# This file is distributed under the same license as the gnumeric package.
+# Copyright Atsushi Shimono <shimono mozilla gr jp>, 2007
+# Copytight Nobuhiro Iwamatsu <iwamatsu debian org>, 2010
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnumeric_1.6.3-2\n"
 "Report-Msgid-Bugs-To: gnumeric packages debian org\n"
 "POT-Creation-Date: 2010-07-31 12:15+0200\n"
-"PO-Revision-Date: 2007-11-13 22:00+0900\n"
-"Last-Translator: Atsushi Shimono <shimono mozilla gr jp>\n"
+"PO-Revision-Date: 2010-11-30 08:17+0900\n"
+"Last-Translator: Nobuhiro Iwamatsu <iwamatsu debian org>\n"
 "Language-Team: Japanese <debian-japanese lists debian org>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 
 #. Type: title
 #. Description
 #: ../gnumeric.templates:2001
 msgid "Detected a running gnumeric process"
-msgstr ""
+msgstr "å®?è¡?中ã?® gnumeric ã??ã?­ã?»ã?¹ã??è¦?ã?¤ã??ã?¾ã??ã??"
 
 #. Type: boolean
 #. Description
@@ -31,18 +32,12 @@ msgstr "gnumeric ã??æ?¬å½?ã?«ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã??ã?¾ã??ã???"
 #. Type: boolean
 #. Description
 #: ../gnumeric.templates:3001
-msgid ""
-"An instance of gnumeric is currently running. If you upgrade now, it may no "
-"longer be able to save its data."
-msgstr ""
-"å®?è¡?中ã?® gnumeric ã??æ¤?å?ºã??ã?¾ã??ã??ã??ã??ã??ã??gnumeric ã??ä»?ã??ã??æ?´æ?°ã??ã??ã?¨ã??ã??ã?®ã??ã?¼"
-"ã?¿ã?¯ä¸?å??ä¿?å­?ã?§ã??ã?ªã??ã?ªã??ã?¾ã??ã??"
+msgid "An instance of gnumeric is currently running. If you upgrade now, it may no longer be able to save its data."
+msgstr "å®?è¡?中ã?® gnumeric ã??æ¤?å?ºã??ã?¾ã??ã??ã??ã??ã??ã??gnumeric ã??ä»?ã??ã??æ?´æ?°ã??ã??ã?¨ã??ã??ã?®ã??ã?¼ã?¿ã?¯ä¸?å??ä¿?å­?ã?§ã??ã?ªã??ã?ªã??ã?¾ã??ã??"
 
 #. Type: boolean
 #. Description
 #: ../gnumeric.templates:3001
-msgid ""
-"You should close the running instances of gnumeric before upgrading this "
-"package."
-msgstr ""
-"ã??ã?®ã??ã??ã?±ã?¼ã?¸ã??ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã??ã??å??ã?«ã??å®?è¡?中ã?® gnumeric ã??çµ?äº?ã??ã?¹ã??ã?§ã??ã??"
+msgid "You should close the running instances of gnumeric before upgrading this package."
+msgstr "ã??ã?®ã??ã??ã?±ã?¼ã?¸ã??ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã??ã??å??ã?«ã??å®?è¡?中ã?® gnumeric ã??çµ?äº?ã??ã?¹ã??ã?§ã??ã??"
+
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 93d17d8..c59d1e0 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -1,38 +1,36 @@
-# Brazilian Portuguese translation (gnumeric)
+# Brazilian Portuguese translation of gnumeric
 # Copyright (C)2007 The gnumeric's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnumeric package.
-# Eder L. Marques <frolic debian-ce org>, 2007.
+# Eder L. Marques <eder edermarques net>, 2007-2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnumeric 1.6.3-5\n"
 "Report-Msgid-Bugs-To: gnumeric packages debian org\n"
 "POT-Creation-Date: 2010-07-31 12:15+0200\n"
-"PO-Revision-Date: 2007-03-27 10:05-0300\n"
-"Last-Translator: Eder L. Marques <frolic debian-ce org>\n"
-"Language-Team: l10n Portuguese <debian-l10n-portuguese lists debian org>\n"
-"Language: \n"
+"PO-Revision-Date: 2011-03-19 18:03-0300\n"
+"Last-Translator: Eder L. Marques <eder edermarques net>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese lists debian org>"
+"\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"pt_BR utf-8\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: pt_BR\n"
 
 #. Type: title
 #. Description
 #: ../gnumeric.templates:2001
 msgid "Detected a running gnumeric process"
-msgstr ""
+msgstr "Foi detectado um processo gnumeric em execução"
 
 #. Type: boolean
 #. Description
 #: ../gnumeric.templates:3001
 msgid "Really upgrade gnumeric?"
-msgstr ""
+msgstr "Realmente atualizar o gnumeric?"
 
 #. Type: boolean
 #. Description
 #: ../gnumeric.templates:3001
-#, fuzzy
 #| msgid ""
 #| "It appears there is an instance of gnumeric running currently. If you "
 #| "upgrade gnumeric now, that instance may not be able to save its data "
@@ -41,14 +39,12 @@ msgid ""
 "An instance of gnumeric is currently running. If you upgrade now, it may no "
 "longer be able to save its data."
 msgstr ""
-"Parece que existe uma instância do gnumeric sendo atualmente executada. Se "
-"você atualizar o gnumeric agora, esta instância pode não ser mais capaz de "
-"salvar seus dados."
+"Uma instância do gnumeric está atualmente em execução. Se você "
+"atualizar agora, ela pode não ser mais capaz de salvar seus dados."
 
 #. Type: boolean
 #. Description
 #: ../gnumeric.templates:3001
-#, fuzzy
 #| msgid ""
 #| "You are strongly recommended to close the running instances of gnumeric "
 #| "prior to upgrading this package."
@@ -56,8 +52,8 @@ msgid ""
 "You should close the running instances of gnumeric before upgrading this "
 "package."
 msgstr ""
-"Você é fortemente recomendado a fechar as instâncias em execução do gnumeric "
-"antes de atualizar este pacote."
+"Você deve fechar as instâncias em execução do gnumeric antes de atualizar "
+"esse pacote."
 
 #~ msgid "Are you sure you want to upgrade gnumeric right now?"
 #~ msgstr "Você tem certeza de que você quer atualizar o gnumeric agora?"
diff --git a/debian/rules b/debian/rules
index d215784..10624ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,17 +34,15 @@ features:=
 # Spreadsheet indexer for beagle
 features+= --enable-ssindex
 
-# Plugins to access databases through the GDA framework and through GnomeDB.
+# Plugins to access databases through the GDA framework.
 #
 # The GnomeDB plugin for gnumeric requires a version of GnomeDB that is not
 # available as packages yet.
 #	Tue, 01 Sep 2009 20:49:41 +0200
-# Likewise for GDA.
-#	Sun, 29 Nov 2009 22:29:18 +0100
-features+= --without-gda --without-gnomedb
+features+= --without-gda
 
-# Psion files support
-features+= --with-psiconv
+# Psion files support?
+features+= --without-psiconv
 
 # Paradox database files plugin
 features+= --with-paradox
@@ -231,8 +229,7 @@ binary-indep: build install
 	dh_installdocs -i
 
 	dh_installexamples -i
-	dh_pycentral -i
-	#dh_python -i
+	dh_python2 -i
 	dh_installmenu -i
 #	dh_installlogrotate -i
 #	dh_installemacsen -i
@@ -264,8 +261,7 @@ binary-arch: build install
 	dh_installdocs -a --noscripts
 	rm -rf `pwd`/debian/gnumeric-doc/usr/share/doc-base
 	dh_installexamples -a
-	dh_pycentral -a
-	#dh_python -a
+	dh_python2 -a
 	dh_installmenu -a
 #	dh_installlogrotate -a
 #	dh_installemacsen -a
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]