[java-gnome] 19/19: Imported Debian patch 4.1.3-2
Tony Mancill
tmancill at moszumanska.debian.org
Wed Sep 10 04:12:44 UTC 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository java-gnome.
commit 36ad9d0ed739579261af628bf075e6ab74676e7d
Author: tony mancill <tmancill at debian.org>
Date: Tue Aug 26 10:10:30 2014 -0700
Imported Debian patch 4.1.3-2
---
debian/changelog | 11 ++++
debian/control | 4 +-
debian/patches/01_take_screenshots.diff | 16 +++---
debian/patches/03_build_doc_snapshots.diff | 10 ++--
debian/patches/04_translations.patch | 88 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
6 files changed, 113 insertions(+), 17 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 45d1b0f..9d1ff31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+java-gnome (4.1.3-2) unstable; urgency=medium
+
+ * Team upload.
+ * Rename existing Portuguese transation as Brazilian (pt_BR)
+ and replace existing Portuguese translation. (Closes: #759039)
+ - Thank you to Américo Monteiro for the translation.
+ * Update Vcs URLs.
+ * Refresh patches.
+
+ -- tony mancill <tmancill at debian.org> Tue, 26 Aug 2014 10:10:30 -0700
+
java-gnome (4.1.3-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 5c57668..3925a27 100644
--- a/debian/control
+++ b/debian/control
@@ -26,8 +26,8 @@ Build-Depends: cdbs,
Standards-Version: 3.9.5
Section: java
Homepage: http://java-gnome.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-gnome
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/java-gnome
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/java-gnome
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/java-gnome
Package: libjava-gnome-java
Architecture: all
diff --git a/debian/patches/01_take_screenshots.diff b/debian/patches/01_take_screenshots.diff
index b6756f7..0b26880 100644
--- a/debian/patches/01_take_screenshots.diff
+++ b/debian/patches/01_take_screenshots.diff
@@ -1,11 +1,9 @@
## Description: enable screenshots taking for the documentation.
## Origin/Author: add some origin or author
## Bug: bug URL
-Index: java-gnome-4.1.1/tests/screenshots/Harness.java
-===================================================================
---- java-gnome-4.1.1.orig/tests/screenshots/Harness.java 2011-07-11 06:34:06.000000000 +0200
-+++ java-gnome-4.1.1/tests/screenshots/Harness.java 2011-07-28 21:09:03.801856812 +0200
-@@ -91,7 +91,7 @@
+--- a/tests/screenshots/Harness.java
++++ b/tests/screenshots/Harness.java
+@@ -92,7 +92,7 @@
*/
public final class Harness
{
@@ -14,7 +12,7 @@ Index: java-gnome-4.1.1/tests/screenshots/Harness.java
public static void main(String[] args) throws IOException, InterruptedException {
final String DISPLAY;
-@@ -134,15 +134,15 @@
+@@ -135,15 +135,15 @@
checkAlive(xServerVirtual, "Xvfb");
System.out.println("EXEC\tmetacity");
@@ -33,7 +31,7 @@ Index: java-gnome-4.1.1/tests/screenshots/Harness.java
}
Gtk.init(new String[] {
-@@ -174,7 +174,7 @@
+@@ -175,7 +175,7 @@
SnapshotQuestionMessageDialog.class,
SnapshotTreeView.class,
SnapshotTreeStore.class,
@@ -42,7 +40,7 @@ Index: java-gnome-4.1.1/tests/screenshots/Harness.java
SnapshotAboutDialog.class,
SnapshotHScale.class,
SnapshotVScale.class,
-@@ -188,7 +188,7 @@
+@@ -189,7 +189,7 @@
SnapshotContextLine.class,
SnapshotTextView.class,
SnapshotTextViewBorderWindows.class,
@@ -51,7 +49,7 @@ Index: java-gnome-4.1.1/tests/screenshots/Harness.java
SnapshotContextArc.class,
SnapshotContextArcNegative.class,
SnapshotMatrixRotate.class,
-@@ -311,7 +311,7 @@
+@@ -313,7 +313,7 @@
if (windowManager != null) {
System.out.println("KILL\tmetacity");
windowManager.destroy();
diff --git a/debian/patches/03_build_doc_snapshots.diff b/debian/patches/03_build_doc_snapshots.diff
index 04443cc..f74c06d 100644
--- a/debian/patches/03_build_doc_snapshots.diff
+++ b/debian/patches/03_build_doc_snapshots.diff
@@ -1,14 +1,12 @@
## Description: Fix accessibility bus address error for doc
## Origin/Author: Guillaume Mazoyer
-Index: java-gnome-4.1.3/build/faster
-===================================================================
---- java-gnome-4.1.3.orig/build/faster 2014-05-19 20:23:16.843587816 +0200
-+++ java-gnome-4.1.3/build/faster 2014-05-19 20:23:30.223654164 +0200
-@@ -679,6 +679,7 @@ def compileDocumentation():
+--- a/build/faster
++++ b/build/faster
+@@ -679,6 +679,7 @@
def takeSnapshots():
+ os.environ['NO_AT_BRIDGE'] = '1'
runJavaClass("Harness", "tmp/gtk-4.1.jar:tmp/tests/")
-
+
diff --git a/debian/patches/04_translations.patch b/debian/patches/04_translations.patch
new file mode 100644
index 0000000..a49fb13
--- /dev/null
+++ b/debian/patches/04_translations.patch
@@ -0,0 +1,88 @@
+--- a/doc/po/pt.po
++++ b/doc/po/pt.po
+@@ -1,13 +1,18 @@
++# Translation of java-gnome po4a to European Portuguese
++#
++# Américo Monteiro <a_monteiro at gmx.com>, 2014.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: example 0.1\n"
+-"PO-Revision-Date: 2008-03-22 17:04+0100\n"
+-"Last-Translator: Vreixo Formoso <metalpain2002 at yahoo.es>\n"
+-"Language-Team: Portuguese <translation-team-pt at lists.sourceforge.net>\n"
++"Project-Id-Version: java-gnome 4.1.3-1\n"
++"PO-Revision-Date: 2014-08-24 00:29+0100\n"
++"Last-Translator: Américo Monteiro <a_monteiro at gmx.com>\n"
++"Language-Team: Portuguese <traduz at debianpt.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"Language: pt\n"
++"X-Generator: Lokalize 1.4\n"
+
+ #: ../ExampleTranslation.java:30
+ msgid "Goodbye"
+@@ -20,7 +25,7 @@
+ #: ../ExampleTranslation.java:45
+ #, java-format
+ msgid "User name is {0} and home dir is {1}"
+-msgstr "O nome de usuário é {0} e a pasta pessoal é {1}"
++msgstr "O nome de utilizador é {0} e o directório pessoal é {1}"
+
+ #: ../ExampleTranslation.java:48
+ #, java-format
+@@ -37,5 +42,7 @@
+ msgid ""
+ "There {0,choice,0#are no files|1#is one file|1<are {0,number,integer} files}."
+ msgstr ""
+-"{0,choice,0#Não há arquivos|1#Há um arquivo|1<Há {0,number,integer} "
+-"arquivos}."
++"{0,choice,0#Não existem ficheiros|1#Existe um ficheiro|1<são "
++"{0,number,integer} ficheiros}."
++
++
+--- /dev/null
++++ b/doc/po/pt_BR.po
+@@ -0,0 +1,41 @@
++msgid ""
++msgstr ""
++"Project-Id-Version: example 0.1\n"
++"PO-Revision-Date: 2008-03-22 17:04+0100\n"
++"Last-Translator: Vreixo Formoso <metalpain2002 at yahoo.es>\n"
++"Language-Team: Portuguese <translation-team-pt at lists.sourceforge.net>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++
++#: ../ExampleTranslation.java:30
++msgid "Goodbye"
++msgstr "Adeus"
++
++#: ../ExampleTranslation.java:40
++msgid "Hello"
++msgstr "Olá"
++
++#: ../ExampleTranslation.java:45
++#, java-format
++msgid "User name is {0} and home dir is {1}"
++msgstr "O nome de usuário é {0} e a pasta pessoal é {1}"
++
++#: ../ExampleTranslation.java:48
++#, java-format
++msgid "This costs {0,number,currency}"
++msgstr "Isto custa {0,number,currency}"
++
++#: ../ExampleTranslation.java:49
++#, java-format
++msgid "Today is {0,date,long}"
++msgstr "Hoje é {0,date,long}"
++
++#: ../ExampleTranslation.java:52
++#, java-format
++msgid ""
++"There {0,choice,0#are no files|1#is one file|1<are {0,number,integer} files}."
++msgstr ""
++"{0,choice,0#Não há arquivos|1#Há um arquivo|1<Há {0,number,integer} "
++"arquivos}."
diff --git a/debian/patches/series b/debian/patches/series
index f15239b..960de6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_take_screenshots.diff
02_build_python.diff
03_build_doc_snapshots.diff
+04_translations.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-gnome.git
More information about the pkg-java-commits
mailing list