diff -Nru ubuntu-packaging-guide-0.3.4/conf.py ubuntu-packaging-guide-0.3.5/conf.py --- ubuntu-packaging-guide-0.3.4/conf.py 2013-10-05 15:01:37.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/conf.py 2014-04-01 23:56:06.000000000 +0000 @@ -43,7 +43,7 @@ project = u'ubuntu-packaging-guide' authors = 'Ubuntu Developers' licence = 'Creative Commons Attribution-ShareAlike 3.0' -copyright = u'2010-2013 , ' + authors + ', ' + licence +copyright = u'2010-2014 , ' + authors + ', ' + licence changelog = "debian/changelog" diff -Nru ubuntu-packaging-guide-0.3.4/debian/changelog ubuntu-packaging-guide-0.3.5/debian/changelog --- ubuntu-packaging-guide-0.3.4/debian/changelog 2014-01-09 19:01:24.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/debian/changelog 2014-04-01 23:59:46.000000000 +0000 @@ -1,3 +1,20 @@ +ubuntu-packaging-guide (0.3.5) unstable; urgency=medium + + [ Dmitry Shachnev ] + * Fix argument of gpg --fingerprint (LP: #1281908, thanks John Kim). + * Add information about sending OpenPGP keys to keyserver (LP: #1281910). + * Update release codenames to current versions (LP: #1283305). + * More information about (un)installing .deb packages (LP: #1283323). + * Update dput command to work for all PPAs (LP: #1283318). + + [ Andrew Starr-Bochicchio ] + * Add favicon (LP: #1281919). + + [ Daniel Holbach ] + * Update copyright. + + -- Andrew Starr-Bochicchio Tue, 01 Apr 2014 19:59:27 -0400 + ubuntu-packaging-guide (0.3.4) unstable; urgency=low [ Andrew Starr-Bochicchio ] diff -Nru ubuntu-packaging-guide-0.3.4/debian/copyright ubuntu-packaging-guide-0.3.5/debian/copyright --- ubuntu-packaging-guide-0.3.4/debian/copyright 2013-06-25 22:28:42.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/debian/copyright 2014-04-01 23:56:06.000000000 +0000 @@ -4,7 +4,7 @@ Source: http://launchpad.net/ubuntu-packaging-guide Files: * -Copyright: 2010-2013, Ubuntu Developers +Copyright: 2010-2014, Ubuntu Developers License: CC-BY-SA-3.0 Files: themes/ubuntu/static/images/background-header-home.png diff -Nru ubuntu-packaging-guide-0.3.4/po/ca.po ubuntu-packaging-guide-0.3.5/po/ca.po --- ubuntu-packaging-guide-0.3.4/po/ca.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/ca.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2012-05-23 14:04+0000\n" "Last-Translator: David Planella \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:56+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:54+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/de.po ubuntu-packaging-guide-0.3.5/po/de.po --- ubuntu-packaging-guide-0.3.4/po/de.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/de.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" -"PO-Revision-Date: 2013-12-06 10:13+0000\n" -"Last-Translator: Daniel Holbach \n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" +"PO-Revision-Date: 2014-03-20 16:18+0000\n" +"Last-Translator: M Oberhauser \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:56+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-03-21 06:36+0000\n" +"X-Generator: Launchpad (build 16967)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -484,12 +484,16 @@ "This will create a directory ``saucy`` and install a minimal saucy system " "into it." msgstr "" +"Es wird daraufhin eine Verzeichnis namens ``saucy`` erstellt und ein " +"minimales Saucy-System hineininstalliert." #: ../ubuntu-packaging-guide/chroots.rst:23 msgid "" "If your version of ``debootstrap`` does not know about saucy you can try " "upgrading to the version in ``backports``." msgstr "" +"Falls deine Version von ``debootstrap`` saucy nicht erkennt, kannst du " +"versuchen auf die Version in ``backports`` to aktualisieren." #: ../ubuntu-packaging-guide/chroots.rst:26 msgid "You can then work inside the chroot::" @@ -2155,7 +2159,7 @@ #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:5 msgid "Fixing FTBFS packages" -msgstr "" +msgstr "FTBFS-Pakete reparieren" #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:7 msgid "" @@ -2183,6 +2187,8 @@ "Cancelled build (X): The build has been cancelled for some reason. These " "should probably be avoided to start with." msgstr "" +"Erstellung abgebrochen (X): Die Erstellung wurde aus einem Grund " +"abgebrochen. Davon sollten folgende von Anfang vermieden werden." #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:17 msgid "" @@ -2200,16 +2206,22 @@ "fixed by a rebuild. Ask a developer to rebuild the package and that should " "fix it." msgstr "" +"Fehler im chroot (C): Ein Teil des chroot is fehlgeschlagen, das kann meist " +"durch eine Neuerstellung des Pakets behoben werden. Bitte einen Entwickler " +"eine Neuerstellung vorzunehmen." #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:23 msgid "" "Failed to upload (U): The package could not upload. This is usually just a " "case of asking for a rebuild, but check the build log first." msgstr "" +"Fehler beim Hochladen (U): Das Paket konnte nicht hochgeladen werden. Das " +"ist normalerweise ein Fall um eine Neuerstellung zu bitten, aber überprüfe " +"zuerst das Erstellungsprotokoll." #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:27 msgid "First steps" -msgstr "" +msgstr "Erste Schritte" #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:28 msgid "" @@ -2218,6 +2230,10 @@ "and then getting the tarball or running ``dget PACKAGE_DSC`` on the .dsc " "file from the launchpad page. Once you have that, build it in a schroot." msgstr "" +"Als erstes solltest du versuchen das FTBFS selbst zu reproduzieren. Hol dir " +"den Code entweder per ``bzr branch lp:ubuntu/PACKAGE`` und dann den Tarball " +"oder per ``dget PACKAGE_DSC`` auf der \".dsc\"-Datei von der Launchpad-" +"Seite. Ist das einmal erledigt, erstelle es in einer schroot." #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:35 msgid "" @@ -2227,10 +2243,16 @@ "help find if the issue is caused by a missing, unlisted, dependency (builds " "locally but fails on a schroot)." msgstr "" +"Du solltest in der Lage sein das FTBFS zu reproduzieren. Wenn nicht, " +"überprüfe ob gerade eine fehlende Abhängigkeit heruntergeladen wird, was " +"bedeutet das du sie zu einer Erstellungsabhängigkeit in debain/control " +"machen musst. Ein Paket lokal zu erstellen hilft auch ein Problem ausfindig " +"zu machen, was durch eine eine fehlende, nicht aufgeführte Abhängigkeit " +"verursacht wird (funktioniert lokal aber nicht in einer schroot)." #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:42 msgid "Checking Debian" -msgstr "" +msgstr "Debian überprüfen" #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:43 msgid "" @@ -2243,10 +2265,20 @@ "https://wiki.debian.org/qa.debian.org/FTBFS, you will want to check it for " "solutions too." msgstr "" +"Kannst du das Problem reproduzieren, ist es an der Zeit eine Lösung zu " +"finden. Falls das Paket auch in Debian enthalten ist, kannst du überprüfen " +"ob es dort erstellt werden kann, indem du auf " +"http://packages.qa.debian.org/PACKAGE gehst. Falls Debian eine aktuelle " +"Version einsetzt, solltest du sie mergen. Falls nicht, überprüfe die " +"Erstellungs- und Fehlerberichte, die auf der Seite verlinkt sind, für " +"zusätzliche Infos über FTBFS oder Patches. Debian betreut auch eine Liste " +"von Befehl-FTBFS und wie sie behoben werden können; sie ist unter " +"https://wiki.debian.org/qa.debian.org/FTBFS zu finden, du wirst sie sicher " +"auch bei der Lösungssuche einbeziehen wollen." #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:53 msgid "ARM64" -msgstr "" +msgstr "ARM64" #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:54 msgid "" @@ -2261,7 +2293,7 @@ #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:63 msgid "Other causes of a package to FTBFS" -msgstr "" +msgstr "Andere Gründe warum die Paketerstellung fehlsschlägt" #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:64 msgid "" @@ -2269,6 +2301,9 @@ "will have to file a MIR bug. https://wiki.ubuntu.com/MainInclusionProcess " "explains the procedure." msgstr "" +"Wenn ein Paket in main enthalten ist, aber eine dessen Abhängigkeiten ist " +"nicht in main vorhanden, sollte ein MIR-Fehlerbericht eingereicht werden. " +"https://wiki.ubuntu.com/MainInclusionProcess erklärt den Ablauf." #: ../ubuntu-packaging-guide/fixing-ftbfs.rst:72 msgid "" @@ -2276,6 +2311,10 @@ "other bug. Make a patch, add it to a bzr branch or bug, subscribe ubuntu-" "sponsors, then try to get it included upstream and/or in Debian." msgstr "" +"Hast du erst einmal eine Lösung für das Problem gefunden, folge demselben " +"Prozess wie bei jedem anderen Fehler. Erstelle einen Patch, hänge ihn an " +"einen bzr-Zweig oder -Fehler an, informiere ubuntu-sponsors, und versuche " +"dann das der Patch von Upstream und/oder Debian aufgenommen wird." #: ../ubuntu-packaging-guide/getting-set-up.rst:3 msgid "Getting Set Up" @@ -2343,6 +2382,9 @@ "`_ or :doc:`chroots <./chroots>` " "to safely use the development release." msgstr "" +"Mach dir deswegen aber keine Sorgen, du kannst `Testdrive " +"`_ or :doc:`chroots <./chroots>` " +"verwenden um sicher eine Entwicklerversion zu benutzen." #: ../ubuntu-packaging-guide/getting-set-up.rst:31 msgid "Install basic packaging software" @@ -2592,6 +2634,10 @@ "necessary packages for a \"minimal installation\". These will be cached " "though." msgstr "" +"wobei beispielsweise `raring`, `quantal`, `precise` oder " +"im Falle von Debian auch `sid` sein kann. Das kann ein bisschen dauern bis " +"alle benötigen Pakete für eine \"Minimalinstallation\" heruntergeladen " +"wurden. Diese werden zumindest vorrätig gespeichert." #: ../ubuntu-packaging-guide/getting-set-up.rst:153 msgid "Get set up to work with Launchpad" @@ -3064,6 +3110,12 @@ "work on the guide, `grab the source `_ there as well." msgstr "" +"Wir sind stets darauf bedacht diese Anleitung zu verbessern. Wenn du " +"Probleme haben solltest oder Vorschläge hast, `erstelle bitte einen Bericht " +"auf Launchpad `_. Für den " +"Fall dass du an der Anleitung mitarbeiten willst, `hol dir den Code " +"`_ ebenfalls von dort." #: ../ubuntu-packaging-guide/introduction-to-ubuntu-development.rst:3 msgid "Introduction to Ubuntu Development" @@ -3960,6 +4012,10 @@ " Also change ``unstable`` to the current development Ubuntu release such as " "``saucy``." msgstr "" +"Ändere die Versionsnummer unter ``debian/changelog`` zu einer Ubuntu-" +"Version: ``2.7-0ubuntu1`` (upstream version 2.7, Debian version 0, Ubuntu " +"version 1). Ändere zudem ``unstable`` in die aktuelle Ubuntu-" +"Veröffentlichung wie ``saucy``." #: ../ubuntu-packaging-guide/packaging-new-software.rst:87 msgid "" @@ -4232,7 +4288,7 @@ #: ../ubuntu-packaging-guide/packaging-new-software.rst:226 msgid "Sreenshots" -msgstr "" +msgstr "Bildschirmfotos" #: ../ubuntu-packaging-guide/packaging-new-software.rst:228 msgid "" @@ -4240,6 +4296,10 @@ "allow propective users to see what the program is like. These should be " "uploaded to http://screenshots.debian.net/upload ." msgstr "" +"Hast du einmal ein Paket zu Debian hochgeladen, solltest du Bildschirmfotos " +"bereitstellen um zukünftigen Benutzern einen Einblick in das Programm zu " +"geben. Diese sollen auf http://screenshots.debian.net/upload hochgeladen " +"werden." #: ../ubuntu-packaging-guide/patches-to-packages.rst:3 msgid "Patches to Packages" @@ -4390,14 +4450,17 @@ "sind einige Einträge, die du verwenden kannst:" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." -msgstr "Beschreibung davon, was der Patch tut." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." +msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "Autor des Patches (i.e. \"Jane Doe \")." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." @@ -4405,7 +4468,7 @@ "Wo der Patch herkommt (z.B. \"upstream\"), wenn *Author* nicht verwendet " "wird." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " @@ -4416,7 +4479,7 @@ "Bugtracker oder in Debian gibt, füge auch *Bug* oder *Bug-Debian* Einträge " "hinzu." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." @@ -4424,22 +4487,22 @@ "Ob der Patch an Upstream weitergeleitet wurde. Entweder \"yes\", \"no\" oder " "\"not-needed\"." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "Datum der letzten Revision (in der Form \"YYYY-MM-DD\")." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "Auf neue Upstream Versionen aktualisieren" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" "Um zur neuen Version zu upgraden, kannst du das ``bzr merge-upstream`` " "Kommando verwenden::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -4452,17 +4515,19 @@ "Gesamtheit entfernt werden. Um nach Problemen zu forschen, wenden Sie die " "Patches nacheinander an::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" +"Wenn er umgekehrt angewendet werden kann, bedeutet das, dass der Patch " +"bereits von Upstream angewendet wurde, damit kann er gelöscht werden::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "Dann fahre fort::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" @@ -4470,15 +4535,15 @@ "Es ist sinnvoll Refresh zu starten, dies wird den Patch entsprechend der " "veränderten Upstreamquelle aktualisieren::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "Dann committe wie ueblich::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "Quilt im Paket verwenden" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." @@ -4487,7 +4552,7 @@ "eingebaut ist. Prüfen Sie ``debian/source/format`` um sich zu vergewissern, " "dass dort ``3.0 (quilt)`` steht." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." @@ -4496,11 +4561,11 @@ "verwenden müssen, normalerweise in dem ein Makefile in ``debian/rules`` " "eingebunden wird." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "Quilt konfigurieren" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" @@ -4509,11 +4574,11 @@ "Hier sind einige Optionen, die nützlich sein können, für die Verwendung von " "quilt mit debian/packages:" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "Andere Patch-Systeme" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -4524,19 +4589,22 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " "then feel free to add Quilt." msgstr "" +"Ändere nicht das Patch-System eines Pakets ohne das mit dem Debian-" +"Maintainer oder dem zuständigen Ubuntu-Team zu besprechen. Wenn derzeit " +"keines existiert, ist es dir freigestellt Quilt hinzuzufügen." #: ../ubuntu-packaging-guide/python-packaging.rst:3 msgid "Packaging Python modules and applications" @@ -5227,14 +5295,19 @@ "for Tomboy, create a shared repository to hold the branches for this " "package. The shared repository will make future work much more efficient." msgstr "" +"Sagen wir du willst an dem Paket Tomboy arbeiten, und du hast überprüft, " +"dass das Quellpaket ``tomboy`` benannt ist. Bevor der Code von Tomboy " +"bezogen wird, erstelle eine gemeinsam genutzte Ablage für die Zweige des " +"Pakets. Die gemeinsame Ablage macht zukünftige Arbeiten um einiges " +"effizienter." #: ../ubuntu-packaging-guide/udd-getting-the-source.rst:70 msgid "" "Do this using the `bzr init-repo` command, passing it the directory name we " "would like to use::" msgstr "" -"Um dies zu tun, kannst Du `bzr init-repo` Kommando verwenden, gib als " -"Argument einfach den Verzeichnisnamen an, den Du verwenden möchtest::" +"Verwende dazu den Befehl `bzr init-repo`, gib als Argument einfach den " +"Verzeichnisnamen an, den Du verwenden möchtest::" #: ../ubuntu-packaging-guide/udd-getting-the-source.rst:75 msgid "" @@ -6264,6 +6337,12 @@ "actual bug number that you're fixing. Your ``debian/changelog`` entry might " "look something like::" msgstr "" +"Sobald du einen Eintrag unter ``debian/changelog`` eingefügt hast, sollte " +"eine Fehlerkennzeichen vorhanden sein, das deutlich macht welchen Fehler von " +"Launchpad du gerade behebst. Das Format für das Kennzeichen ist stark " +"eingeschränkt: ``LP: #12345``. Das Leerzeichen zwischen ``:`` und dem ``#`` " +"ist notwendig und natürlich sollte die tatsächliche Fehlernummer verwendet " +"werden. Dein Eintrag unter ``debian/changelog`` sollte in etwa so aussehen::" #: ../ubuntu-packaging-guide/udd-working.rst:57 msgid "Commit with the normal::" @@ -6355,7 +6434,7 @@ " Florian Diesch https://launchpad.net/~diesch\n" " Hendrik Knackstedt https://launchpad.net/~hennekn\n" " Lars Schütze https://launchpad.net/~laze1989\n" -" M Oberhauser https://launchpad.net/~limurx\n" +" M Oberhauser https://launchpad.net/~zomtir\n" " Maik Wagner https://launchpad.net/~mtwagner\n" " Mathias Dietrich https://launchpad.net/~theghost\n" " Phillip Sz https://launchpad.net/~phillip-sz\n" diff -Nru ubuntu-packaging-guide-0.3.4/po/el.po ubuntu-packaging-guide-0.3.5/po/el.po --- ubuntu-packaging-guide-0.3.4/po/el.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/el.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-04-21 09:39+0000\n" "Last-Translator: Daniel Holbach \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:56+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:54+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/en_AU.po ubuntu-packaging-guide-0.3.5/po/en_AU.po --- ubuntu-packaging-guide-0.3.4/po/en_AU.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/en_AU.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2012-12-07 09:05+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: English (Australia) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/en_CA.po ubuntu-packaging-guide-0.3.5/po/en_CA.po --- ubuntu-packaging-guide-0.3.4/po/en_CA.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/en_CA.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-07-23 07:52+0000\n" "Last-Translator: Shayne White \n" "Language-Team: English (Canada) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:58+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:56+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/es.po ubuntu-packaging-guide-0.3.5/po/es.po --- ubuntu-packaging-guide-0.3.4/po/es.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/es.po 2014-04-01 23:56:06.000000000 +0000 @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2014-01-06 13:21+0000\n" "Last-Translator: Adolfo Jayme \n" "Language-Team: Español; Castellano <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-07 04:59+0000\n" -"X-Generator: Launchpad (build 16877)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" "Language: es\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 @@ -4472,16 +4472,19 @@ "que puede usar:" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." -msgstr "Descripción de lo que hace el parche." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." +msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" "Quién escribió el parque (por ejemplo, «Juana Nadie " "\")." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." @@ -4489,7 +4492,7 @@ "De dónde proviene el parche (por ejemplo, «upstream», aguas arriba), cuando " "no se indica el autor (*Author*)." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " @@ -4499,7 +4502,7 @@ "*https://bugs.launchpad.net/bugs/XXXXXXX*). Si existen tambien errores aguas " "arriba o , añadir cabeceras *Bug* o *Bug-Debian*." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." @@ -4507,22 +4510,22 @@ "Si el parche se reenvió aguas arriba. Uno de «yes» (sí), «no» (no) o «not-" "needed» (no necedsario)." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "Fecha de la última revisión (en formato «YYYY-MM-DD»)." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "Actualizar a nuevas versiones de aguas arriba" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" "Para actualizar a la nueva versión, puede usar la orden ``bzr merge-" "upstream``::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -4534,7 +4537,7 @@ "nuevo código fuentes aguas arriba o deban ser eliminados completamente. Para " "comprobar posibles problemas, aplique los parches uno a uno::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" @@ -4542,11 +4545,11 @@ "Si puede ser aplicado a la inversa significa que el parche ya ha sido " "aplicado aguas arriba, de forma que ya se puede borrar::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "Luego continúe::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" @@ -4554,15 +4557,15 @@ "Es una buena idea hacer un refresco, lo que actualizará el parche relativo a " "los fuentes cambiados aguas arriba::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "Luego confirme como siempre::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "Hacer que un paquete use Quilt" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." @@ -4571,7 +4574,7 @@ "el formato de empaquetado. Compruebe ``debian/source/format`` para " "asegurarse que pone ``3.0 (quilt)``." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." @@ -4580,11 +4583,11 @@ "Quilt explícitamente, normalmente incluyendo un archivo makefile en " "``debian/rules``." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "Configurando Quilt" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" @@ -4593,11 +4596,11 @@ "algunas opciones que pueden resultar útiles para usar quilt con paquetes " "debian:" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "Otros sistemas de parches" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -4616,7 +4619,7 @@ "mostrado en :ref:`capítulos previos `, como una manera " "fiable de trabajar con todos los sistemas." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " @@ -4627,7 +4630,7 @@ "actualización a nuevas versiones de aguas arribas o distinguir entre parches " "por lo que lo mejor es evitarlo." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/fr.po ubuntu-packaging-guide-0.3.5/po/fr.po --- ubuntu-packaging-guide-0.3.4/po/fr.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/fr.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-12-12 17:39+0000\n" "Last-Translator: gisele perreault \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-13 06:07+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:54+0000\n" +"X-Generator: Launchpad (build 16935)\n" "Language: fr\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 @@ -4541,15 +4541,18 @@ "vous pouvez utiliser :" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." -msgstr "Description de ce que fait le correctif." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." +msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" "Qui a écrit le correctif (par exemple, « Jane Doe  »)." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." @@ -4557,7 +4560,7 @@ "D'où provient ce correctif (par exemple « de l'amont »), lorsque *Auteur* " "n'est pas renseigné." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " @@ -4568,7 +4571,7 @@ "également des bogues dans les traceurs de bogues de l'amont ou de Debian, " "ajoutez les en-têtes *Bug* ou *Bug-Debian*." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." @@ -4576,22 +4579,22 @@ "Si le correctif a été transmis à l'amont. Soit « yes », « no » ou « not-" "needed »." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "Date de la dernière révision (au format \"AAAA-MM-JJ\")." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "Mise à niveau vers les nouvelles versions de l'amont" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" "Pour mettre à niveau vers la nouvelle version, vous pouvez utiliser la " "commande ``bzr merge-upstream`` ::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -4604,7 +4607,7 @@ "entièrement supprimés. Pour vérifier les problèmes, appliquez les correctifs " "un par un ::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" @@ -4612,11 +4615,11 @@ "S'il peut être rétro-appliqué, cela signifie que le correctif a déjà été " "appliqué par l'amont, nous pouvons donc le supprimer ::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "Ensuite, continuons ::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" @@ -4624,15 +4627,15 @@ "C'est une bonne idée de lancer l'actualisation, cela va mettre à jour le " "correctif relatif à la source modifiée par l'amont ::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "Ensuite, soumettez comme d'habitude ::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "Réaliser un Paquet avec Quilt" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." @@ -4641,7 +4644,7 @@ "format d'empaquetage. Vérifiez dans ``debian/source/format`` que ce dernier " "est ``3.0 (quilt)``." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." @@ -4650,11 +4653,11 @@ "utiliser Quilt explicitement, généralement en incluant un fichier makefile " "dans ``debian/rules``." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "Configurer Quilt" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" @@ -4663,11 +4666,11 @@ "quelques options pouvant s'avérer utiles pour l'utilisation de quilt avec " "debian/packages :" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "Autres systèmes de correctifs" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -4687,7 +4690,7 @@ ":ref:`chapitre précédent`, comme un moyen fiable pour " "travailler avec tous les systèmes de correctifs." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " @@ -4698,7 +4701,7 @@ "Cela rend difficile leur mise à niveau vers les nouvelles versions de " "l'amont ou la différenciation des correctifs. Il vaut mieux l'éviter." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/hr.po ubuntu-packaging-guide-0.3.5/po/hr.po --- ubuntu-packaging-guide-0.3.4/po/hr.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/hr.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-04-22 13:03+0000\n" "Last-Translator: Daniel Holbach \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/hu.po ubuntu-packaging-guide-0.3.5/po/hu.po --- ubuntu-packaging-guide-0.3.4/po/hu.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/hu.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2012-08-23 10:52+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:56+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:54+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/id.po ubuntu-packaging-guide-0.3.5/po/id.po --- ubuntu-packaging-guide-0.3.4/po/id.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/id.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-07-22 14:30+0000\n" "Last-Translator: Andika Triwidada \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:54+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3204,46 +3204,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3251,57 +3254,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3312,14 +3315,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/it.po ubuntu-packaging-guide-0.3.5/po/it.po --- ubuntu-packaging-guide-0.3.4/po/it.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/it.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-12-07 13:48+0000\n" "Last-Translator: Daniel Holbach \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:54+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/ja.po ubuntu-packaging-guide-0.3.5/po/ja.po --- ubuntu-packaging-guide-0.3.4/po/ja.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/ja.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-06-06 16:30+0000\n" "Last-Translator: Kentaro Kazuhama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:54+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3311,46 +3311,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3358,57 +3361,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3419,14 +3422,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/kn.po ubuntu-packaging-guide-0.3.5/po/kn.po --- ubuntu-packaging-guide-0.3.4/po/kn.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/kn.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-02-12 11:57+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Kannada \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:54+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/lv.po ubuntu-packaging-guide-0.3.5/po/lv.po --- ubuntu-packaging-guide-0.3.4/po/lv.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/lv.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-09-12 22:10+0000\n" "Last-Translator: Janisk \n" "Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3168,46 +3168,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3215,57 +3218,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3276,14 +3279,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/mk.po ubuntu-packaging-guide-0.3.5/po/mk.po --- ubuntu-packaging-guide-0.3.4/po/mk.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/mk.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-04-22 13:03+0000\n" "Last-Translator: Daniel Holbach \n" "Language-Team: Macedonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/my.po ubuntu-packaging-guide-0.3.5/po/my.po --- ubuntu-packaging-guide-0.3.4/po/my.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/my.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-07-14 19:43+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Burmese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:56+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:54+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/nl.po ubuntu-packaging-guide-0.3.5/po/nl.po --- ubuntu-packaging-guide-0.3.4/po/nl.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/nl.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-11-18 07:53+0000\n" "Last-Translator: Hannie Dumoleyn \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:56+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:54+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3345,46 +3345,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3392,57 +3395,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3453,14 +3456,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/pl.po ubuntu-packaging-guide-0.3.5/po/pl.po --- ubuntu-packaging-guide-0.3.4/po/pl.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/pl.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-08-16 10:18+0000\n" "Last-Translator: Daniel Holbach \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/pt_BR.po ubuntu-packaging-guide-0.3.5/po/pt_BR.po --- ubuntu-packaging-guide-0.3.4/po/pt_BR.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/pt_BR.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-12-11 12:59+0000\n" "Last-Translator: Neliton Pereira Jr. \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-12 05:31+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -4025,46 +4025,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "Atualizando para novas versões do upstream" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -4072,7 +4075,7 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" @@ -4080,11 +4083,11 @@ "Se a aplicação puder ser revertida, isto significa que o patch já foi " "aplicado pelo upstream, então podemos excluir o patch::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "Então continue::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" @@ -4092,15 +4095,15 @@ "É bom executar uma atualização do patch relativo ao fonte do upstream " "alterado::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "Então submeta como sempre::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "Fazendo um pacote usar o Quilt" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." @@ -4109,7 +4112,7 @@ "do pacote. Verifique ``debian/source/format`` para assegurar que ele diz " "``3.0 (quilt)``." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." @@ -4117,21 +4120,21 @@ "Pacotes antigos usando o formato de fonte 1.0 terão que explicitar o uso do " "Quilt, normalmente incluindo um makefile dentro de ``debian/rules``." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "Outros sistemas de patch" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -4142,14 +4145,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/ru.po ubuntu-packaging-guide-0.3.5/po/ru.po --- ubuntu-packaging-guide-0.3.4/po/ru.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/ru.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" -"PO-Revision-Date: 2013-12-06 10:13+0000\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" +"PO-Revision-Date: 2014-01-23 13:02+0000\n" "Last-Translator: Daniel Holbach \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -4268,14 +4268,17 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." -msgstr "Описание того, что делает патч." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." +msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "Кто написал патч (например, \"Jane Doe \")." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." @@ -4283,7 +4286,7 @@ "Откуда пришёл этот патч (например, \"upstream\"), если заголовок *Author* " "отсутствует." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " @@ -4294,28 +4297,28 @@ "имеются отчёты об ошибках в апстриме или системах отслеживания ошибок " "Debian, добавьте заголовки *Bug* или *Bug-Debian*." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "Дата последней ревизии (в форме \"ГГГГ-ММ-ДД\")." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "Обновление до новых версий из апстрима" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" "Чтобы выполнить обновление до последней версии, вы можете использовать " "команду ``bzr merge-upstream``::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -4323,7 +4326,7 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" @@ -4331,11 +4334,11 @@ "Если для патча указано ``it can be reverse-applied``, значит патч уже был " "применён апстримом, так что мы можем удалить этот патч::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "Затем продолжайте::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" @@ -4343,21 +4346,21 @@ "Неплохой мыслью будет выполнить refresh, это обновит патч относительно " "изменений исходного кода в апстриме::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "Затем выполните фиксацию, как обычно::" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "Создание пакета с использованием Quilt" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." @@ -4365,11 +4368,11 @@ "Для более старых пакетов, использующих формат 1.0, необходимо использовать " "Quilt явно, обычно с помощью включения make-фала в ``debian/rules``." -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "Конфигурирование Quilt" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" @@ -4378,11 +4381,11 @@ "Вот несколько опций, которые могут быть полезны при использовании quilt с " "пакетами Debian:" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "Другие системы управления патчами" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -4393,14 +4396,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " @@ -6362,6 +6365,7 @@ " Beatrix Kiddo https://launchpad.net/~mashksharn\n" " CSRedRat https://launchpad.net/~csredrat\n" " Daniel Holbach https://launchpad.net/~dholbach\n" +" Daniil Bubnov https://launchpad.net/~demoth-cadaver\n" " Dmitry Shachnev https://launchpad.net/~mitya57\n" " Patsev Anton https://launchpad.net/~patsev-anton\n" " Vladimir Doroshenko https://launchpad.net/~vovktt" diff -Nru ubuntu-packaging-guide-0.3.4/po/sl.po ubuntu-packaging-guide-0.3.5/po/sl.po --- ubuntu-packaging-guide-0.3.4/po/sl.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/sl.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-03-04 14:32+0000\n" "Last-Translator: Daniel Holbach \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3164,46 +3164,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3211,57 +3214,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3272,14 +3275,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/sv.po ubuntu-packaging-guide-0.3.5/po/sv.po --- ubuntu-packaging-guide-0.3.4/po/sv.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/sv.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-08-20 21:08+0000\n" -"Last-Translator: Peter Ahlgren \n" +"Last-Translator: Peter Ahlgren \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3253,46 +3253,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3300,57 +3303,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3361,14 +3364,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/te.po ubuntu-packaging-guide-0.3.5/po/te.po --- ubuntu-packaging-guide-0.3.4/po/te.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/te.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2012-12-06 04:49+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Telugu \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/tr.po ubuntu-packaging-guide-0.3.5/po/tr.po --- ubuntu-packaging-guide-0.3.4/po/tr.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/tr.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" -"PO-Revision-Date: 2013-07-24 18:03+0000\n" -"Last-Translator: ufuk \n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" +"PO-Revision-Date: 2014-03-19 22:04+0000\n" +"Last-Translator: Can Delibas \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-03-20 06:06+0000\n" +"X-Generator: Launchpad (build 16967)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -164,7 +164,7 @@ #: ../ubuntu-packaging-guide/auto-pkg-test.rst:133 msgid "Further examples" -msgstr "" +msgstr "Diğer Örnekler" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:135 msgid "" @@ -198,7 +198,7 @@ #: ../ubuntu-packaging-guide/auto-pkg-test.rst:149 msgid "Ubuntu infrastructure" -msgstr "" +msgstr "Ubuntu altyapısı" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:151 msgid "" @@ -233,15 +233,15 @@ #: ../ubuntu-packaging-guide/auto-pkg-test.rst:169 msgid "run ``bzr branch ubuntu:``," -msgstr "" +msgstr "``bzr branch ubuntu:`` çalıştır," #: ../ubuntu-packaging-guide/auto-pkg-test.rst:170 msgid "edit ``debian/control`` to enable the tests," -msgstr "" +msgstr "testlere izin vermek için ``debian/control`` düzenleyin" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:171 msgid "add the ``debian/tests`` directory," -msgstr "" +msgstr "'debian/tests' dizinini ekleyin," #: ../ubuntu-packaging-guide/auto-pkg-test.rst:172 msgid "" @@ -289,7 +289,7 @@ #: ../ubuntu-packaging-guide/backports.rst:12 msgid "Personal Package Archive (PPA)" -msgstr "" +msgstr "Kişisel Paket Arşivi (PPA)" #: ../ubuntu-packaging-guide/backports.rst:14 msgid "" @@ -338,7 +338,7 @@ #: ../ubuntu-packaging-guide/chroots.rst:3 msgid "Using Chroots" -msgstr "" +msgstr "Chroots Kullanımı" #: ../ubuntu-packaging-guide/chroots.rst:5 msgid "" @@ -356,7 +356,7 @@ #: ../ubuntu-packaging-guide/chroots.rst:14 msgid "Creating a Chroot" -msgstr "" +msgstr "Bir Chroot oluştur" #: ../ubuntu-packaging-guide/chroots.rst:16 msgid "Use the command ``debootstrap`` to create a new chroot::" @@ -376,13 +376,15 @@ #: ../ubuntu-packaging-guide/chroots.rst:26 msgid "You can then work inside the chroot::" -msgstr "" +msgstr "Daha sonra chroot içinde çalışabilirsiniz::" #: ../ubuntu-packaging-guide/chroots.rst:30 msgid "" "Where you can install or remove any package you wish without affecting your " "main system." msgstr "" +"Ana sisteminizi etkilemeden istediğiniz herhangi bir paketi kurabileceğiniz " +"veya kaldırabileceğiniz yer." #: ../ubuntu-packaging-guide/chroots.rst:33 msgid "" @@ -405,15 +407,18 @@ #: ../ubuntu-packaging-guide/chroots.rst:50 msgid "Some programs may need you to bind /dev or /proc." msgstr "" +"Bazı programlar /dev veya /proc bağlamak için size ihtiyaç duyabilir." #: ../ubuntu-packaging-guide/chroots.rst:52 msgid "" "For more information on chroots see our `Debootstrap Chroot wiki page`_." msgstr "" +"Chroot hakkında daha fazla bilgi almak için \"Debootstrap Chroot wiki " +"sayfamıza\" göz atın." #: ../ubuntu-packaging-guide/chroots.rst:55 msgid "Alternatives" -msgstr "" +msgstr "Alternatifler" #: ../ubuntu-packaging-guide/chroots.rst:57 msgid "" @@ -447,7 +452,7 @@ #: ../ubuntu-packaging-guide/communication.rst:3 msgid "Communication in Ubuntu Development" -msgstr "" +msgstr "Ubuntu Geliştirmesinde İletişim" #: ../ubuntu-packaging-guide/communication.rst:5 msgid "" @@ -455,6 +460,9 @@ "are made and hundreds of people interact every day, it is important to " "communicate effectively." msgstr "" +"Binlerce kod satırının değiştirildiği, bir çok kararın alındığı ve " +"yüzlerce kişinin her gün etkileşimde olduğu projelerde etkili bir iletişim " +"önemlidir." #: ../ubuntu-packaging-guide/communication.rst:10 msgid "Mailing lists" @@ -3175,46 +3183,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "Son güncelleme tarihi (\"YYYY-MM-DD\"\" formatında)" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3222,57 +3233,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3283,14 +3294,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " @@ -4925,6 +4936,8 @@ msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" +" Bilal https://launchpad.net/~kira-gazerock\n" +" Can Delibas https://launchpad.net/~candelibas96\n" " Daniel Holbach https://launchpad.net/~dholbach\n" " Dmitry Shachnev https://launchpad.net/~mitya57\n" " Semetey Coşkun https://launchpad.net/~sem0900\n" diff -Nru ubuntu-packaging-guide-0.3.4/po/ubuntu-packaging-guide.pot ubuntu-packaging-guide-0.3.5/po/ubuntu-packaging-guide.pot --- ubuntu-packaging-guide-0.3.4/po/ubuntu-packaging-guide.pot 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/ubuntu-packaging-guide.pot 2014-02-22 01:13:10.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ubuntu-packaging-guide 0.3.4\n" +"Project-Id-Version: ubuntu-packaging-guide 0.3.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2012,90 +2012,90 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "Description of what the patch does. It is formatted like ``Description`` field in ``debian/control``: first line is short description, starting with lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "Where this patch comes from (i.e. \"upstream\"), when *Author* is not present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "A link to Launchpad bug, a short form is preferred (like *https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "When you run this command, all patches will be unapplied, because they can become out of date. They might need to be refreshed to match the new upstream source or they might need to be removed altogether. To check for problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "If it can be reverse-applied this means the patch has been applied already by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "It is a good idea to run refresh, this will update the patch relative to the changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "Modern packages use Quilt by default, it is built into the packaging format. Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "Older packages using source format 1.0 will need to explicitly use Quilt, usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "You can use ``~/.quiltrc`` file to configure quilt. Here are some options that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-patchsys``, these work similarly to Quilt by keeping patches in ``debian/patches`` but have different commands to apply, un-apply or create patches. You can find out which patch system is used by a package by using the ``what-patch`` command (from the ``ubuntu-dev-tools`` package). You can use ``edit-patch``, shown in :ref:`previous chapters `, as a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "In even older packages changes will be included directly to sources and kept in the ``diff.gz`` source file. This makes it hard to upgrade to new upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "Do not change a package's patch system without discussing it with the Debian maintainer or relevant Ubuntu team. If there is no existing patch system then feel free to add Quilt." msgstr "" diff -Nru ubuntu-packaging-guide-0.3.4/po/vi.po ubuntu-packaging-guide-0.3.5/po/vi.po --- ubuntu-packaging-guide-0.3.4/po/vi.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/vi.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2012-10-16 10:17+0000\n" "Last-Translator: Lê Trường An \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/zh_CN.po ubuntu-packaging-guide-0.3.5/po/zh_CN.po --- ubuntu-packaging-guide-0.3.4/po/zh_CN.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/zh_CN.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" "PO-Revision-Date: 2013-04-09 10:53+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:58+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:56+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3162,46 +3162,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3209,57 +3212,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3270,14 +3273,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " diff -Nru ubuntu-packaging-guide-0.3.4/po/zh_HK.po ubuntu-packaging-guide-0.3.5/po/zh_HK.po --- ubuntu-packaging-guide-0.3.4/po/zh_HK.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/zh_HK.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" -"PO-Revision-Date: 2012-11-01 10:50+0000\n" -"Last-Translator: Howard Chan \n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" +"PO-Revision-Date: 2014-01-24 11:43+0000\n" +"Last-Translator: Daniel Holbach \n" "Language-Team: Chinese (Hong Kong) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3164,46 +3164,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3211,57 +3214,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3272,14 +3275,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " @@ -4914,4 +4917,5 @@ msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" -" Howard Chan https://launchpad.net/~smartboyhw" +" Daniel Holbach https://launchpad.net/~dholbach\n" +" Howard Chan https://launchpad.net/~smartboyhw-deactivatedaccount" diff -Nru ubuntu-packaging-guide-0.3.4/po/zh_TW.po ubuntu-packaging-guide-0.3.5/po/zh_TW.po --- ubuntu-packaging-guide-0.3.4/po/zh_TW.po 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/po/zh_TW.po 2014-04-01 23:56:06.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ubuntu-packaging-guide\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2013-12-09 12:22+0100\n" -"PO-Revision-Date: 2013-04-21 19:06+0000\n" -"Last-Translator: Z.X.Lyn \n" +"POT-Creation-Date: 2014-01-22 14:52+0400\n" +"PO-Revision-Date: 2014-01-24 11:44+0000\n" +"Last-Translator: Daniel Holbach \n" "Language-Team: Chinese (Traditional) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-11 05:57+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-02-27 05:55+0000\n" +"X-Generator: Launchpad (build 16935)\n" #: ../ubuntu-packaging-guide/auto-pkg-test.rst:3 msgid "autopkgtest: Automatic testing for packages" @@ -3319,46 +3319,49 @@ msgstr "" #: ../ubuntu-packaging-guide/patches-to-packages.rst:110 -msgid "Description of what the patch does." +msgid "" +"Description of what the patch does. It is formatted like ``Description`` " +"field in ``debian/control``: first line is short description, starting with " +"lowercase letter, the next lines are long description, indented with a space." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:111 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 msgid "Who wrote the patch (i.e. \"Jane Doe \")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:112 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:115 msgid "" "Where this patch comes from (i.e. \"upstream\"), when *Author* is not " "present." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:114 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:117 msgid "" "A link to Launchpad bug, a short form is preferred (like " "*https://bugs.launchpad.net/bugs/XXXXXXX*). If there are also bugs in " "upstream or Debian bugtrackers, add *Bug* or *Bug-Debian* headers." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:118 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:121 msgid "" "Whether the patch was forwarded upstream. Either \"yes\", \"no\" or \"not-" "needed\"." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:120 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:123 msgid "Date of the last revision (in form \"YYYY-MM-DD\")." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:124 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:127 msgid "Upgrading to New Upstream Versions" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:126 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:129 msgid "" "To upgrade to the new version, you can use ``bzr merge-upstream`` command::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:130 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:133 msgid "" "When you run this command, all patches will be unapplied, because they can " "become out of date. They might need to be refreshed to match the new " @@ -3366,57 +3369,57 @@ "problems, apply the patches one at a time::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:142 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:145 msgid "" "If it can be reverse-applied this means the patch has been applied already " "by upstream, so we can delete the patch::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:148 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:151 msgid "Then carry on::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:153 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:156 msgid "" "It is a good idea to run refresh, this will update the patch relative to the " "changed upstream source::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:159 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:162 msgid "Then commit as usual::" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:165 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:168 msgid "Making A Package Use Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:167 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:170 msgid "" "Modern packages use Quilt by default, it is built into the packaging format. " " Check in ``debian/source/format`` to ensure it says ``3.0 (quilt)``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:171 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:174 msgid "" "Older packages using source format 1.0 will need to explicitly use Quilt, " "usually by including a makefile into ``debian/rules``." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:176 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:179 msgid "Configuring Quilt" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:178 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:181 msgid "" "You can use ``~/.quiltrc`` file to configure quilt. Here are some options " "that can be useful for using quilt with debian/packages:" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:192 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:195 msgid "Other Patch Systems" msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:194 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:197 msgid "" "Other patch systems used by packages include ``dpatch`` and ``cdbs simple-" "patchsys``, these work similarly to Quilt by keeping patches in " @@ -3427,14 +3430,14 @@ "a reliable way to work with all systems." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:202 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:205 msgid "" "In even older packages changes will be included directly to sources and kept " "in the ``diff.gz`` source file. This makes it hard to upgrade to new " "upstream versions or differentiate between patches and is best avoided." msgstr "" -#: ../ubuntu-packaging-guide/patches-to-packages.rst:206 +#: ../ubuntu-packaging-guide/patches-to-packages.rst:209 msgid "" "Do not change a package's patch system without discussing it with the Debian " "maintainer or relevant Ubuntu team. If there is no existing patch system " @@ -5070,7 +5073,8 @@ msgstr "" "Launchpad Contributions:\n" " Cheng-Chia Tseng https://launchpad.net/~zerng07\n" -" Howard Chan https://launchpad.net/~smartboyhw\n" +" Daniel Holbach https://launchpad.net/~dholbach\n" +" Howard Chan https://launchpad.net/~smartboyhw-deactivatedaccount\n" " Z.X.Lyn https://launchpad.net/~newzxl" #~ msgid "" diff -Nru ubuntu-packaging-guide-0.3.4/themes/ubuntu/layout.html ubuntu-packaging-guide-0.3.5/themes/ubuntu/layout.html --- ubuntu-packaging-guide-0.3.4/themes/ubuntu/layout.html 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/themes/ubuntu/layout.html 2014-04-01 23:56:06.000000000 +0000 @@ -3,7 +3,7 @@ ~~~~~~~~~~~~~~~~~ Ubuntu layout template for Sphinx themes based on default Sphinx template. - :copyright: 2010-2013, Ubuntu Developers + :copyright: 2010-2014, Ubuntu Developers :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS. :license: BSD, see LICENSE for details. #} @@ -63,6 +63,7 @@ {%- block htmltitle %} {{ title|striptags|e }}{{ titlesuffix }} {%- endblock %} + Binary files /tmp/ppt4Qo7LWW/ubuntu-packaging-guide-0.3.4/themes/ubuntu/static/images/favicon.ico and /tmp/W_q4PwrO1v/ubuntu-packaging-guide-0.3.5/themes/ubuntu/static/images/favicon.ico differ diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/auto-pkg-test.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/auto-pkg-test.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/auto-pkg-test.rst 2013-07-03 01:39:08.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/auto-pkg-test.rst 2014-04-01 23:56:06.000000000 +0000 @@ -104,14 +104,14 @@ bzr branch lp:auto-package-testing cd auto-package-testing -And provision a Saucy AMD64 system:: +And provision a Trusty AMD64 system:: - ./bin/prepare-testbed -r saucy amd64 + ./bin/prepare-testbed -r trusty amd64 -This command will create a pristine Saucy AMD64 VM from a cloud image. To +This command will create a pristine Trusty AMD64 VM from a cloud image. To run the tests, simply run:: - ./bin/run-adt-test -r saucy -a amd64 \ + ./bin/run-adt-test -r trusty -a amd64 \ -S file:///tmp/glib2.0-2.35.7/ glib2.0 This would use the source package in ``/tmp/glib2.0-2.35.7/`` and run the @@ -190,7 +190,7 @@ .. _`gvfs tests`: https://bazaar.launchpad.net/+branch/ubuntu/gvfs/files/head:/debian/tests/ .. _`gtk+3.0 tests`: https://bazaar.launchpad.net/+branch/ubuntu/gtk+3.0/files/head:/debian/tests/ .. _`ubiquity tests`: https://bazaar.launchpad.net/+branch/ubiquity/files/head:/debian/tests/ -.. _`automatically run autopkgtest tests`: https://jenkins.qa.ubuntu.com/view/Saucy/view/AutoPkgTest/ +.. _`automatically run autopkgtest tests`: https://jenkins.qa.ubuntu.com/view/Trusty/view/AutoPkgTest/ .. _`lp:auto-package-testing`: https://code.launchpad.net/auto-package-testing .. _`auto-package-testing documentation`: http://bazaar.launchpad.net/~auto-package-testing-dev/auto-package-testing/trunk/view/head:/doc/USAGE.md .. _`list of required test-cases`: https://wiki.ubuntu.com/QATeam/RequiredTests diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/chroots.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/chroots.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/chroots.rst 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/chroots.rst 2014-04-01 23:56:06.000000000 +0000 @@ -15,17 +15,17 @@ Use the command ``debootstrap`` to create a new chroot:: - $ sudo debootstrap saucy saucy/ + $ sudo debootstrap trusty trusty/ -This will create a directory ``saucy`` and install a minimal saucy system +This will create a directory ``trusty`` and install a minimal trusty system into it. -If your version of ``debootstrap`` does not know about saucy you can try +If your version of ``debootstrap`` does not know about Trusty you can try upgrading to the version in ``backports``. You can then work inside the chroot:: - $ sudo chroot saucy + $ sudo chroot trusty Where you can install or remove any package you wish without affecting your main system. @@ -33,8 +33,8 @@ You might want to copy your GPG/ssh keys and Bazaar configuration into the chroot so you can access and sign packages directly:: - $ sudo mkdir saucy/home/ - $ sudo cp -r ~/.gnupg ~/.ssh ~/.bazaar saucy/home/ + $ sudo mkdir trusty/home/ + $ sudo cp -r ~/.gnupg ~/.ssh ~/.bazaar trusty/home/ To stop apt and other programs complaining about missing locales you can install your relevant language pack:: @@ -44,7 +44,7 @@ If you want to run X programs you will need to bind the /tmp directory into the chroot, from outside the chroot run:: - $ sudo mount -t none -o bind /tmp saucy/tmp + $ sudo mount -t none -o bind /tmp trusty/tmp $ xhost + Some programs may need you to bind /dev or /proc. diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/debian-dir-overview.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/debian-dir-overview.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/debian-dir-overview.rst 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/debian-dir-overview.rst 2014-04-01 23:56:06.000000000 +0000 @@ -43,7 +43,7 @@ Here is a sample ``changelog`` file for hello:: - hello (2.8-0ubuntu1) raring; urgency=low + hello (2.8-0ubuntu1) trusty; urgency=low * New upstream release with lots of bug fixes and feature improvements. @@ -82,9 +82,9 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Jane Doe - Standards-Version: 3.9.1 + Standards-Version: 3.9.5 Build-Depends: debhelper (>= 7) - Bzr-Vcs: lp:ubuntu/hello + Vcs-Bzr: lp:ubuntu/hello Homepage: http://www.gnu.org/software/hello/ Package: hello diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/fixing-a-bug.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/fixing-a-bug.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/fixing-a-bug.rst 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/fixing-a-bug.rst 2014-04-01 23:56:06.000000000 +0000 @@ -150,7 +150,7 @@ This will add a boilerplate changelog entry for you and launch an editor where you can fill in the blanks. An example of this could be:: - specialpackage (1.2-3ubuntu4) raring; urgency=low + specialpackage (1.2-3ubuntu4) trusty; urgency=low * debian/control: updated description to include frobnicator (LP: #123456) @@ -194,11 +194,11 @@ This could for example be:: - lp:~emmaadams/ubuntu/raring/specialpackage/fix-for-123456 + lp:~emmaadams/ubuntu/trusty/specialpackage/fix-for-123456 So if you just run:: - bzr push lp:~emmaadams/ubuntu/raring/specialpackage/fix-for-123456 + bzr push lp:~emmaadams/ubuntu/trusty/specialpackage/fix-for-123456 bzr lp-propose you should be all set. The push command should push it to Launchpad and the diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/getting-set-up.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/getting-set-up.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/getting-set-up.rst 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/getting-set-up.rst 2014-04-01 23:56:06.000000000 +0000 @@ -144,7 +144,7 @@ $ pbuilder-dist create -where is for example `raring`, `quantal`, `precise` or in the case of +where is for example `raring`, `saucy`, `trusty` or in the case of Debian maybe `sid`. This will take a while as it will download all the necessary packages for a "minimal installation". These will be cached though. @@ -203,9 +203,11 @@ Upload your GPG key to Launchpad ---------------------------------- +First, you will need to get your fingerprint and key ID. + To find about your GPG fingerprint, run:: - $ gpg --fingerprint + $ gpg --fingerprint email@address.com and it will print out something like:: @@ -214,6 +216,13 @@ uid Daniel Holbach sub 4096R/51FBE68C 2010-12-06 +Then run this command to submit your key to Ubuntu keyserver:: + + $ gpg --keyserver keyserver.ubuntu.com --send-keys 43CDE61D + +where ``43CDE61D`` should be replaced by your key ID (which is in the +first line of output of the previous command). Now you can import your +key to Launchpad. Head to https://launchpad.net/~/+editpgpkeys and copy the "Key fingerprint" into the text box. In the case above this would be diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/libraries.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/libraries.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/libraries.rst 2012-11-06 15:07:05.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/libraries.rst 2014-04-01 23:56:06.000000000 +0000 @@ -35,7 +35,7 @@ We will use libnova as an example:: - $ bzr branch ubuntu:natty/libnova + $ bzr branch ubuntu:trusty/libnova $ sudo apt-get install libnova-dev To find the SONAME of the library run:: diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/packaging-new-software.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/packaging-new-software.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/packaging-new-software.rst 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/packaging-new-software.rst 2014-04-01 23:56:06.000000000 +0000 @@ -82,7 +82,7 @@ In ``debian/changelog`` change the version number to an Ubuntu version: ``2.7-0ubuntu1`` (upstream version 2.7, Debian version 0, Ubuntu version 1). Also change ``unstable`` to the current -development Ubuntu release such as ``saucy``. +development Ubuntu release such as ``trusty``. Much of the package building work is done by a series of scripts called ``debhelper``. The exact behaviour of ``debhelper`` changes @@ -142,10 +142,15 @@ $ lesspipe hello_2.7-0ubuntu1_amd64.deb -Install the package and check it works:: +Install the package and check it works (later you will be able to uninstall it +using ``sudo apt-get remove hello`` if you want):: $ sudo dpkg --install hello_2.7-0ubuntu1_amd64.deb +You can also install all packages at once using:: + + $ sudo debi + Next Steps ---------- @@ -176,7 +181,7 @@ $ bzr builddeb -S $ cd ../build-area - $ pbuilder-dist precise build hello_2.7-0ubuntu1.dsc + $ pbuilder-dist trusty build hello_2.7-0ubuntu1.dsc When you are happy with your package you will want others to review it. You can upload the branch to Launchpad for review:: @@ -187,7 +192,7 @@ others to test the binary packages. You will need to set up a PPA in Launchpad and then upload with ``dput``:: - $ dput ppa: hello_2.7-0ubuntu1.changes + $ dput ppa:/ hello_2.7-0ubuntu1.changes See :doc:`uploading<./udd-uploading>` for more information. diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/patches-to-packages.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/patches-to-packages.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/patches-to-packages.rst 2013-06-25 22:28:42.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/patches-to-packages.rst 2014-04-01 23:56:06.000000000 +0000 @@ -15,9 +15,9 @@ fortunately we are standardizing on one system, `Quilt`_, which is now used by most packages. -Let's look at an example package, ``kamoso`` in Natty:: +Let's look at an example package, ``kamoso`` in Trusty:: - $ bzr branch ubuntu:natty/kamoso + $ bzr branch ubuntu:trusty/kamoso The patches are kept in ``debian/patches``. This package has one patch ``kubuntu_01_fix_qmax_on_armel.diff`` to fix a compile failure on ARM. The @@ -108,6 +108,9 @@ of patch file. Here are some headers that you can use: :Description: Description of what the patch does. + It is formatted like ``Description`` field in ``debian/control``: + first line is short description, starting with lowercase letter, + the next lines are long description, indented with a space. :Author: Who wrote the patch (i.e. "Jane Doe "). :Origin: Where this patch comes from (i.e. "upstream"), when *Author* is not present. diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/traditional-packaging.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/traditional-packaging.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/traditional-packaging.rst 2013-08-18 18:58:12.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/traditional-packaging.rst 2014-04-01 23:56:06.000000000 +0000 @@ -32,9 +32,9 @@ By default, the latest version in the development release will be downloaded. You can also specify a version or Ubuntu release like:: - $ pull-lp-source precise + $ pull-lp-source trusty -to pull the source from the ``precise`` release, or:: +to pull the source from the ``trusty`` release, or:: $ pull-lp-source 1.0-1ubuntu1 diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/udd-getting-the-source.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/udd-getting-the-source.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/udd-getting-the-source.rst 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/udd-getting-the-source.rst 2014-04-01 23:56:06.000000000 +0000 @@ -20,13 +20,13 @@ To refer to the version of a source package in an older release of Ubuntu, just prefix the package name with the release's code name. E.g. to refer to -Tomboy's source package in Quantal_ use:: +Tomboy's source package in Saucy_ use:: - ubuntu:quantal/tomboy + ubuntu:saucy/tomboy Since they are unique, you can also abbreviate the distro-series name:: - ubuntu:m/tomboy + ubuntu:s/tomboy You can use a similar scheme to access the source branches in Debian, although there are no shortcuts for the Debian distro-series names. To access the @@ -40,7 +40,7 @@ .. _`Bazaar`: http://bazaar.canonical.com/en/ -.. _Quantal: https://wiki.ubuntu.com/QuantalQuetzal +.. _Saucy: https://wiki.ubuntu.com/SaucySalamander .. _Wheezy: http://debian.org/releases/stable/ diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/udd-latest.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/udd-latest.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/udd-latest.rst 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/udd-latest.rst 2014-04-01 23:56:06.000000000 +0000 @@ -16,7 +16,7 @@ $ bzr pull This works wherever you have a checkout of a branch, so it will work for -things like branches of `quantal`, `precise-proposed`, etc. +things like branches of `saucy`, `trusty-proposed`, etc. Getting the latest in to your working branches diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/udd-sponsorship.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/udd-sponsorship.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/udd-sponsorship.rst 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/udd-sponsorship.rst 2014-04-01 23:56:06.000000000 +0000 @@ -29,10 +29,10 @@ lp:~/ubuntu/// -For example, to push your fix for bug 12345 in the Tomboy package for Raring, +For example, to push your fix for bug 12345 in the Tomboy package for Trusty, you'd use:: - $ bzr push lp:~subgenius/ubuntu/raring/tomboy/bug-12345 + $ bzr push lp:~subgenius/ubuntu/trusty/tomboy/bug-12345 The last component of the path is arbitrary; it's up to you to pick something meaningful. @@ -46,7 +46,7 @@ If that fails, then you can use:: - $ xdg-open https://code.launchpad.net/~subgenius/ubuntu/raring/tomboy/bug-12345 + $ xdg-open https://code.launchpad.net/~subgenius/ubuntu/trusty/tomboy/bug-12345 where most of the URL matches what you used for `bzr push`. On this page, you'll see a link that says *Propose for merging into another branch*. Type diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/udd-uploading.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/udd-uploading.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/udd-uploading.rst 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/udd-uploading.rst 2014-04-01 23:56:06.000000000 +0000 @@ -87,7 +87,7 @@ of merging from a branch you created, you merge from the branch in the merge proposal:: - $ bzr merge lp:~subgenius/ubuntu/raring/tomboy/bug-12345 + $ bzr merge lp:~subgenius/ubuntu/trusty/tomboy/bug-12345 If there are lots of merge conflicts you would probably want to ask the contributor to fix them up. See the next section to learn how to cancel @@ -128,7 +128,7 @@ changes based on what the contributor provides then you should start by grabbing their branch:: - $ bzr branch lp:~subgenius/ubuntu/raring/tomboy/bug-12345 + $ bzr branch lp:~subgenius/ubuntu/trusty/tomboy/bug-12345 then work in this new branch, and then merge it in to the main one and upload as if it was your own work. The contributor will still be mentioned in the diff -Nru ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/udd-working.rst ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/udd-working.rst --- ubuntu-packaging-guide-0.3.4/ubuntu-packaging-guide/udd-working.rst 2014-01-09 18:45:17.000000000 +0000 +++ ubuntu-packaging-guide-0.3.5/ubuntu-packaging-guide/udd-working.rst 2014-04-01 23:56:06.000000000 +0000 @@ -48,9 +48,9 @@ number that you're fixing. Your ``debian/changelog`` entry might look something like:: - tomboy (1.12.0-1ubuntu3) raring urgency=low + tomboy (1.12.0-1ubuntu3) trusty; urgency=low - * Don't fubar the frobnicator. (LP: #12345) + * Don't fubar the frobnicator. (LP: #12345) -- Bob Dobbs Mon, 10 Sep 2013 16:10:01 -0500