Package: typecatcher Version: 0.1.2-1 On the second run typecatcher doesn't build, because the first run changed typecatcher-0.1.2/po/typecatcher.pot:
dpkg-buildpackage: source package typecatcher dpkg-buildpackage: source version 0.1.2-1 dpkg-buildpackage: source changed by Andrew Starr-Bochicchio <a...@debian.org> dpkg-buildpackage: host architecture amd64 dpkg-source --before-build typecatcher-0.1.2 fakeroot debian/rules clean dh clean --with python2 dh_testdir dh_auto_clean running clean removing 'build' (and everything under it) 'build/lib.linux-x86_64-2.6' does not exist -- can't clean it 'build/bdist.linux-x86_64' does not exist -- can't clean it 'build/scripts-2.6' does not exist -- can't clean it WARNING: the following files are not recognized by DistUtilsExtra.auto: help/C/figures/home.png help/C/figures/typecatcher.svg help/C/index.page help/C/topic1.page po/typecatcher.pot typecatcher.desktop.in running clean 'build/lib.linux-x86_64-2.7' does not exist -- can't clean it 'build/bdist.linux-x86_64' does not exist -- can't clean it 'build/scripts-2.7' does not exist -- can't clean it WARNING: the following files are not recognized by DistUtilsExtra.auto: help/C/figures/home.png help/C/figures/typecatcher.svg help/C/index.page help/C/topic1.page po/typecatcher.pot typecatcher.desktop.in dh_clean dpkg-source -b typecatcher-0.1.2 dpkg-source: info: using source format `3.0 (quilt)' dpkg-source: info: building typecatcher using existing ./typecatcher_0.1.2.orig.tar.gz dpkg-source: info: local changes detected, the modified files are: typecatcher-0.1.2/po/typecatcher.pot dpkg-source: info: you can integrate the local changes with dpkg-source --commit dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/typecatcher_0.1.2-1.diff.QxVgH3 dpkg-buildpackage: error: dpkg-source -b typecatcher-0.1.2 gave error exit status 2 Regards Harri
Description: <short summary of the patch> TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. . typecatcher (0.1.2-1) unstable; urgency=low . * New upstream bugfix release (LP: #1250595). Author: Andrew Starr-Bochicchio <a...@debian.org> Bug-Ubuntu: https://bugs.launchpad.net/bugs/1250595 --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: <vendor|upstream|other>, <url of original patch> Bug: <url in upstream bugtracker> Bug-Debian: http://bugs.debian.org/<bugnumber> Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> Forwarded: <no|not-needed|url proving that it has been forwarded> Reviewed-By: <name and email of someone who approved the patch> Last-Update: <YYYY-MM-DD> --- typecatcher-0.1.2.orig/po/typecatcher.pot +++ typecatcher-0.1.2/po/typecatcher.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-16 14:42-0400\n" +"POT-Creation-Date: 2014-02-10 07:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -17,82 +17,69 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/__init__.py:32 #: ../typecatcher/__init__.py:32 msgid "Show debug messages (-vv debugs typecatcher_lib also)" msgstr "" -#: ../data/ui/AboutTypeCatcherDialog.ui.h:1 -msgid "Copyright (C) 2012 Andrew Starr-Bochicchio <a.star...@gmail.com>" -msgstr "" - -#: ../data/ui/AboutTypeCatcherDialog.ui.h:2 -msgid "Download Google webfonts for use on the desktop." -msgstr "" - -#: ../data/ui/AboutTypeCatcherDialog.ui.h:3 -msgid "" -"# Copyright (C) 2012 Andrew Starr-Bochicchio <a.star...@gmail.com>\n" -"# This program is free software: you can redistribute it and/or modify it \n" -"# under the terms of the GNU General Public License version 3, as " -"published \n" -"# by the Free Software Foundation.\n" -"# \n" -"# This program is distributed in the hope that it will be useful, but \n" -"# WITHOUT ANY WARRANTY; without even the implied warranties of \n" -"# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR \n" -"# PURPOSE. See the GNU General Public License for more details.\n" -"# \n" -"# You should have received a copy of the GNU General Public License along \n" -"# with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "" - -#: ../typecatcher/TypeCatcherWindow.py:72 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/TypeCatcherWindow.py:71 +#: ../typecatcher/TypeCatcherWindow.py:71 msgid "Fonts" msgstr "" -#: ../typecatcher/TypeCatcherWindow.py:215 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/TypeCatcherWindow.py:213 +#: ../typecatcher/TypeCatcherWindow.py:213 msgid "This the install button." msgstr "" -#: ../typecatcher/TypeCatcherWindow.py:217 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/TypeCatcherWindow.py:214 +#: ../typecatcher/TypeCatcherWindow.py:214 msgid "" "Select a font on the left and press this button. The font will be installed " "for off-line use." msgstr "" -#: ../typecatcher/TypeCatcherWindow.py:229 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/TypeCatcherWindow.py:222 +#: ../typecatcher/TypeCatcherWindow.py:222 msgid "This the uninstall button." msgstr "" -#: ../typecatcher/TypeCatcherWindow.py:231 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/TypeCatcherWindow.py:223 +#: ../typecatcher/TypeCatcherWindow.py:223 msgid "" "Select a font on the left and press this button. It will be removed from " "your system." msgstr "" -#: ../typecatcher/TypeCatcherWindow.py:244 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/TypeCatcherWindow.py:232 +#: ../typecatcher/TypeCatcherWindow.py:232 msgid "This the info button." msgstr "" -#: ../typecatcher/TypeCatcherWindow.py:246 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/TypeCatcherWindow.py:233 +#: ../typecatcher/TypeCatcherWindow.py:233 msgid "" "Select a font on the left and press this button. A browser will open with " "further information about the chosen font." msgstr "" -#: ../typecatcher/html_preview.py:118 +#: ../typecatcher/html_preview.py:110 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/html_preview.py:110 msgid "Installed" msgstr "" -#: ../typecatcher/html_preview.py:119 +#: ../typecatcher/html_preview.py:111 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/html_preview.py:111 msgid "Font not available." msgstr "" -#: ../typecatcher/html_preview.py:120 +#: ../typecatcher/html_preview.py:112 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/html_preview.py:112 msgid "Please check your network connection." msgstr "" -#: ../typecatcher/html_preview.py:128 +#: ../typecatcher/html_preview.py:120 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/html_preview.py:120 msgid "" "One morning, when Gregor Samsa woke from troubled dreams, he found himself " "transformed in his bed into a horrible vermin. He lay on his armour-like " @@ -100,7 +87,8 @@ msgid "" "slightly domed and divided by arches into stiff sections." msgstr "" -#: ../typecatcher/html_preview.py:129 +#: ../typecatcher/html_preview.py:121 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/html_preview.py:121 msgid "" "Far out in the uncharted backwaters of the unfashionable end of the Western " "Spiral arm of the Galaxy lies a small unregarded yellow sun. Orbiting this " @@ -108,14 +96,16 @@ msgid "" "insignificant little blue-green planet..." msgstr "" -#: ../typecatcher/html_preview.py:130 +#: ../typecatcher/html_preview.py:122 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/html_preview.py:122 msgid "" "Many years later, as he faced the firing squad, Colonel Aureliano Buendia " "was to remember that distant afternoon when his father took him to discover " "ice." msgstr "" -#: ../typecatcher/html_preview.py:131 +#: ../typecatcher/html_preview.py:123 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/html_preview.py:123 msgid "" "I am an invisible man. No, I am not a spook like those who haunted Edgar " "Allan Poe; nor am I one of your Hollywood-movie ectoplasms. I am a man of " @@ -124,121 +114,183 @@ msgid "" "to see me." msgstr "" -#: ../typecatcher/html_preview.py:132 +#: ../typecatcher/html_preview.py:124 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/html_preview.py:124 msgid "" "Stately, plump Buck Mulligan came from the stairhead, bearing a bowl of " "lather on which a mirror and a razor lay crossed. A yellow dressinggown, " "ungirdled, was sustained gently behind him on the mild morning air." msgstr "" -#: ../typecatcher/html_preview.py:152 +#: ../typecatcher/html_preview.py:144 +#: ../debian/typecatcher/usr/lib/python2.6/dist-packages/typecatcher/html_preview.py:144 msgid "Enter text..." msgstr "" -#: ../typecatcher.desktop.in.h:1 ../data/ui/TypeCatcherWindow.ui.h:12 -msgid "TypeCatcher" -msgstr "" - -#: ../typecatcher.desktop.in.h:2 -msgid "Download Google webfonts for off-line use" -msgstr "" - #: ../data/ui/TypeCatcherWindow.ui.h:1 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:1 msgid "Translate this app" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:2 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:2 msgid "Report a bug" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:3 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:3 msgid "Select text to display" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:4 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:4 msgid "Custom text" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:5 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:5 msgid "Random" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:6 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:6 msgid "ipsum" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:7 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:7 msgid "Kafka" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:8 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:8 msgid "Adams" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:9 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:9 msgid "Marquez" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:10 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:10 msgid "Ellison" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:11 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:11 msgid "Joyce" msgstr "" +#: ../data/ui/TypeCatcherWindow.ui.h:12 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:12 +#: ../typecatcher.desktop.in.h:1 +msgid "TypeCatcher" +msgstr "" + #: ../data/ui/TypeCatcherWindow.ui.h:13 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:13 msgid "_File" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:14 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:14 msgid "_Help" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:15 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:15 msgid "Contents" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:16 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:16 msgid "Download font..." msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:17 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:17 msgid "Download font" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:18 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:18 msgid "Uninstall font..." msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:19 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:19 msgid "Uninstall font" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:20 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:20 msgid "Font info..." msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:21 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:21 msgid "Font info" msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:22 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:22 msgid "Font size..." msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:23 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:23 msgid "Search fonts..." msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:24 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:24 msgid "Clear search..." msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:25 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:25 msgid "Select text..." msgstr "" #: ../data/ui/TypeCatcherWindow.ui.h:26 +#: ../debian/typecatcher/usr/share/typecatcher/ui/TypeCatcherWindow.ui.h:26 msgid "Select text" msgstr "" + +#: ../debian/typecatcher/usr/share/typecatcher/ui/AboutTypeCatcherDialog.ui.h:1 +#: ../data/ui/AboutTypeCatcherDialog.ui.h:1 +msgid "Copyright (C) 2012 Andrew Starr-Bochicchio <a.star...@gmail.com>" +msgstr "" + +#: ../debian/typecatcher/usr/share/typecatcher/ui/AboutTypeCatcherDialog.ui.h:2 +#: ../data/ui/AboutTypeCatcherDialog.ui.h:2 +msgid "Download Google webfonts for use on the desktop." +msgstr "" + +#: ../debian/typecatcher/usr/share/typecatcher/ui/AboutTypeCatcherDialog.ui.h:3 +#: ../data/ui/AboutTypeCatcherDialog.ui.h:3 +msgid "" +"# Copyright (C) 2012 Andrew Starr-Bochicchio <a.star...@gmail.com>\n" +"# This program is free software: you can redistribute it and/or modify it \n" +"# under the terms of the GNU General Public License version 3, as " +"published \n" +"# by the Free Software Foundation.\n" +"# \n" +"# This program is distributed in the hope that it will be useful, but \n" +"# WITHOUT ANY WARRANTY; without even the implied warranties of \n" +"# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR \n" +"# PURPOSE. See the GNU General Public License for more details.\n" +"# \n" +"# You should have received a copy of the GNU General Public License along \n" +"# with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "" + +#: ../typecatcher.desktop.in.h:2 +msgid "Download Google webfonts for off-line use" +msgstr "" + +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../typecatcher.desktop.in.h:4 +msgid "fonts;viewer;" +msgstr ""
