[Monotone-commits-diffs] org.debian.monotone: bbabe4d0f643d54c3e2db4e899f206004ed7de9c

[code]

revision:            bbabe4d0f643d54c3e2db4e899f206004ed7de9c
date:                2012-03-09T09:39:27
author:              Richard Levitte <address@hidden>
branch:              org.debian.monotone
changelog:
merge of '931bb11e7c00caa5c0be76ce0c0ed5bf9d95ccb0'
     and 'b6aa02c6a8d5e7de584825939da05e8c811d2199'

manifest:
format_version "1"

new_manifest [8275187270e55d0aefa802e3e9d6e3461ace0a2f]

old_revision [931bb11e7c00caa5c0be76ce0c0ed5bf9d95ccb0]

patch "NEWS"
 from [8bc3d4ad19514c4c0ce9fe34092f2219f990ea00]
   to [c8bd3ec4a94a86a348233f6b03e524ae35122010]

patch "changelog"
 from [b4c59a7965552efa1b8eac8dd447da8b7543026a]
   to [c7313e49616c7e9adf484f84b2d2b5b6ec8f1a05]

patch "control"
 from [c15336837da5d51e4de284b765dcc95d31ca5ba9]
   to [779ff70351159a88315d2bbf0597e226ce54ad5e]

patch "po/fr.po"
 from [8d8b6777a3cf5235d2e4030493381f48b96ec6ee]
   to [79179e1cd8aceaf4cf91d681e5afecec78270e26]

patch "rules"
 from [30cd3012c7c46422bff2988de9fdd5f44a1eddf8]
   to [b4c6807a480b24b9b6e08bca2f74d877e761d95b]

patch "watch"
 from [598d45f1fba94d6e2bfb0688f6d38f9edf5e0a9f]
   to [75e6c3aa536399e1e51b36db51cccff16811e997]

old_revision [b6aa02c6a8d5e7de584825939da05e8c811d2199]

add_file "po/pl.po"
 content [784bbff98131a7dd31c8490dcc0f6ef68313d725]
============================================================
--- NEWS	8bc3d4ad19514c4c0ce9fe34092f2219f990ea00
+++ NEWS	c8bd3ec4a94a86a348233f6b03e524ae35122010
@@ -1,4 +1,4 @@
-monotone (1.0~dev-2) unstable; urgency=low
+monotone (1.0-1) unstable; urgency=low
 
   A new package is produced, called monotone-extras, containing a
   tested collection of extra scripts and monotone hooks.
============================================================
--- changelog	b4c59a7965552efa1b8eac8dd447da8b7543026a
+++ changelog	c7313e49616c7e9adf484f84b2d2b5b6ec8f1a05
@@ -1,3 +1,31 @@
+monotone (1.0-3) unstable; urgency=low
+
+  [Francis Russell]
+  * debian/po/fr.po: minor fix to the French Debconf translation
+    (closes: #623226). 
+  * debian/NEWS: update version of most recent entry to 1.0-1 to keep
+    Lintian happy.
+  * debian/watch: update regular _expression_ to avoid including the file
+    suffix in the version number reported by uscan. 
+  * debian/control: Update Vcs-Browser field to point to Debian
+    packaging instead of upstream development and add Vcs-Mtn field
+    (closes: #638501).
+  * Standards-Version: 3.9.2 (no changes required). 
+
+  [Ludovic Brenta]
+  * Tighten build-dependencies to libbotan1.8-dev (>= 1.8.13-4).
+    Closes: #635776.
+
+ -- Ludovic Brenta <address@hidden>  Fri, 23 Sep 2011 23:46:49 +0200
+
+monotone (1.0-2) unstable; urgency=low
+
+  * debian/watch: also check for bzip2 compressed monotone releases.
+  * debian/rules: disable parallel builds since they have been observed
+    to cause make to enter an infinite loop (closes: #623734).
+
+ -- Francis Russell <address@hidden>  Sat, 30 Apr 2011 03:57:31 +0100
+
 monotone (1.0-1) unstable; urgency=low
 
   [ Richard Levitte ]
============================================================
--- control	c15336837da5d51e4de284b765dcc95d31ca5ba9
+++ control	779ff70351159a88315d2bbf0597e226ce54ad5e
@@ -6,14 +6,15 @@ Homepage: http://monotone.ca/
  Zack Weinberg <address@hidden>, Ludovic Brenta <address@hidden>,
  Francis Russell <address@hidden>
 Homepage: http://monotone.ca/
-Vcs-Browser: http://code.monotone.ca/p/monotone/source/tree/h:net.venge.monotone/
+Vcs-Browser: https://code.monotone.ca/p/debian-mtn/source/tree/h:org.debian.monotone/
+Vcs-Mtn: mtn://monotone.ca/debian-mtn?org.debian.monotone
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, po-debconf, quilt, patch,
- libboost-dev, libbotan1.8-dev, libidn11-dev, liblua5.1-0-dev, libpcre3-dev,
- libsqlite3-dev, libz-dev, texinfo,
- expect, bash-completion, bash (>= 4.0), source-highlight, mime-construct
+ libboost-dev, libbotan1.8-dev (>= 1.8.13-4), libidn11-dev, liblua5.1-0-dev,
+ libpcre3-dev, libsqlite3-dev, libz-dev, texinfo, expect, bash-completion,
+ bash (>= 4.0), source-highlight, mime-construct
 Build-Depends-Indep: poppler-utils | xpdf-utils, ps2eps,
  texlive-generic-recommended, texlive-latex-base
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 
 Package: monotone
 Architecture: any
============================================================
--- po/fr.po	8d8b6777a3cf5235d2e4030493381f48b96ec6ee
+++ po/fr.po	79179e1cd8aceaf4cf91d681e5afecec78270e26
@@ -65,4 +65,4 @@ msgstr ""
 "generated for you."
 msgstr ""
 "Veuillez choisir une phrase secrète pour la clé de monotone. Si vous ne "
-"choisissez rien, une phrase sera crée automatiquement."
+"choisissez rien, une phrase sera créée automatiquement."
============================================================
--- rules	30cd3012c7c46422bff2988de9fdd5f44a1eddf8
+++ rules	b4c6807a480b24b9b6e08bca2f74d877e761d95b
@@ -48,8 +48,12 @@ export DH_VERBOSE=1
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
 
+# It is desirable to be able to pass the "--parallel" option to dh.
+# Unfortunately, parallel builds of monotone currently cause make to
+# enter an infinite loop. When the cause has been determined and
+# resolved, this option should be re-enabled.
 %:
-	dh $@ --parallel --with=bash_completion
+	dh $@ --with=bash_completion
 
 override_dh_auto_configure:
 	debian/nofakeroot dh_auto_configure
============================================================
--- watch	598d45f1fba94d6e2bfb0688f6d38f9edf5e0a9f
+++ watch	75e6c3aa536399e1e51b36db51cccff16811e997
@@ -1,3 +1,3 @@ http://www.monotone.ca/downloads/([\d\.]
 version=3
 http://www.monotone.ca/downloads/([\d\.]+)/ \
-	monotone-([\d\.]+)\.tar\.gz debian uupdate
+	monotone-([\d\.]+)\.tar\.(?:gz|bz2) debian uupdate
============================================================
--- /dev/null	
+++ po/pl.po	784bbff98131a7dd31c8490dcc0f6ef68313d725
@@ -0,0 +1,73 @@
+# Polish debconf templates translation for monotone.
+#
+# This file is made available under the GNU GPL version 2.0 or
+# greater.  See the accompanying file COPYING for details.
+#
+# Michał Kułach <address@hidden>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: address@hidden"
+"POT-Creation-Date: 2009-09-04 14:30-0700\n"
+"PO-Revision-Date: 2012-03-07 10:43+0100\n"
+"Last-Translator: Michał Kułach <address@hidden>\n"
+"Language-Team: Polish <address@hidden>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#. Type: boolean
+#. Description
+#: ../monotone-server.templates:1001
+msgid "Automatically manage monotone database?"
+msgstr "Zarządzać bazą danych monotone w sposób automatyczny?"
+
+#. Type: boolean
+#. Description
+#: ../monotone-server.templates:1001
+msgid ""
+"Select this option to automatically manage the monotone database. If "
+"selected, the database will automatically be created. Also when upgrading, "
+"the database will be automatically migrated if necessary."
+msgstr ""
+"Wybranie tej opcji spowoduje automatyczne zarządzanie bazą danych monotone. "
+"Baza zostanie wtedy utworzona automatycznie, a także, jeśli to będzie "
+"konieczne podczas aktualizacji, zostanie wykonana automatyczna migracja bazy "
+"danych."
+
+#. Type: string
+#. Description
+#: ../monotone-server.templates:2001
+msgid "Monotone key id:"
+msgstr "Identyfikator klucza monotone:"
+
+#. Type: string
+#. Description
+#: ../monotone-server.templates:2001
+msgid ""
+"Enter the id of the key your monotone server will use. The key id is "
+"typically an email address."
+msgstr ""
+"Proszę wprowadzić identyfikator klucza, który będzie używany przez serwer "
+"monotone. Z reguły jest to adres poczty elektronicznej."
+
+#. Type: password
+#. Description
+#: ../monotone-server.templates:3001
+msgid "Monotone key passphrase:"
+msgstr "Hasło klucza monotone:"
+
+#. Type: password
+#. Description
+#: ../monotone-server.templates:3001
+msgid ""
+"Please choose a passphrase for your monotone key. If left blank, one will be "
+"generated for you."
+msgstr ""
+"Proszę wybrać hasło do klucza monotone. Jeśli pole pozostanie puste, zostanie "
+"wygenerowane automatycznie."
+