From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 5 May 2008 09:03:16 +0000 (+0200)
Subject: * Mark a message from dselect backend as translatable
X-Git-Tag: 0.7.24ubuntu1~70^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/549da1a850f0fd50e0a55415452ecaa735d49451?hp=8f6aa8efa522c90959fb827a8618f02f41e0a2cd

* Mark a message from dselect backend as translatable
  Thanks to Frédéric Bothamy for the patch
  Closes: #322470
* Simplified Chinese updated. Closes: #473360
* Catalan fixes. Closes: #387141
* Typo fix in Greek translation. Closes: #479122
* French updated.
* Thai updated. Closes: #479313
* Italian updated. Closes: #479326
* Polish updated. Closes: #479342
* Bulgarian updated. Closes: #479379
* Finnish updated. Closes: #479403
* Korean updated. Closes: #479426
* Basque updated. Closes: #479452
* Add missing build-depends back from build-depends-indep field.
  Closes: #478231
* Make cron script quiet if cache is locked. Thanks to Ted Percival
  <ted@midg3t.net> for the patch. Closes: #459344
* Add timeout support for https. Thanks to Andrew Martens
  <andrew.martens@strangeloopnetworks.com> for the patch.
* Add support for --no-download on apt-get update. Closes: #478517

  - Vietnamese updated. Closes: #479008

  - Enable more complete debugging information when Debug::pkgAutoRemove
    is set.
* debian/rules:
  - Add missing Build-Depends-Indep on xsltproc, docbook-xsl, and xmlto.
---

diff --git a/cmdline/apt-key b/cmdline/apt-key
index bf1a5fefb..3f886987e 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -86,7 +86,7 @@ update() {
     # add new keys from the package;
 
     # we do not use add_keys_with_verify_against_master_keyring here,
-    # because we "update" is run on regular package updates.  A
+    # because "update" is run on regular package updates.  A
     # attacker might as well replace the master-archive-keyring file
     # in the package and add his own keys. so this check wouldn't
     # add any security. we *need* this check on net-update though
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000000000..9da152556
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,6 @@
+Build this package with:
+$ debian/rules arch-build
+or
+$ DEB_BUILD_PROG_OPTS="-S" debian/rules arch-build
+
+make sure you have the pre-build-depds in README.arch installed
diff --git a/debian/changelog b/debian/changelog
index 53c3e1c88..0a42c92ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,7 @@ apt (0.7.12) unstable; urgency=low
       starting the upate to hit the mirrors less hard
   * doc/apt_preferences.5.xml:
     - fix typo
+  * added debian/README.source
 
   [ Christian Perrier ]
   * Fix typos in manpages. Thanks to Daniel Leidert for the fixes