summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--debian/control4
-rw-r--r--po/ca.po10
-rw-r--r--po/cs.po10
-rw-r--r--po/ru.po10
-rwxr-xr-xtest/integration/test-apt-get-download2
6 files changed, 37 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index fbc6009a1..558b657ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low
* cmdline/apt-get.cc:
- do not have space between "-a" and option when cross building
(closes: #703792)
+ * test/integration/test-apt-get-download:
+ - fix test now that #1098752 is fixed
+ * po/{ca,cs,ru}.po:
+ - fix merge artifact
-- Christian Perrier <bubulle@debian.org> Sun, 24 Mar 2013 08:57:45 +0100
diff --git a/debian/control b/debian/control
index 50b3599fc..762d2818e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
po4a (>= 0.34-2), autotools-dev, autoconf, automake
Build-Depends-Indep: doxygen, debiandoc-sgml
Build-Conflicts: autoconf2.13, automake1.4
-Vcs-Bzr: http://bzr.debian.org/apt/debian-wheezy/
-Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-wheezy/
+Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
+Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
Package: apt
Architecture: any
diff --git a/po/ca.po b/po/ca.po
index 41488ba3c..0f3570949 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2438,6 +2438,16 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s… Fet"
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr "…"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
+
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
diff --git a/po/cs.po b/po/cs.po
index cb260c621..6e9543939 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2416,6 +2416,16 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s… Hotovo"
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr "…"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
+
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
diff --git a/po/ru.po b/po/ru.po
index 2a72ee3c1..703a83a7c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2474,6 +2474,16 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s… Готово"
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr "…"
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s… %u%%"
+
#: apt-pkg/contrib/cmndline.cc:80
#, c-format
msgid "Command line option '%c' [from %s] is not known."
diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download
index b164f7dba..420b2e380 100755
--- a/test/integration/test-apt-get-download
+++ b/test/integration/test-apt-get-download
@@ -26,7 +26,7 @@ testdownload apt_1.0_all.deb apt stable
testdownload apt_2.0_all.deb apt
DEBFILE="$(readlink -f aptarchive)/pool/apt_2.0_all.deb"
-testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) sha256:$(sha256sum $DEBFILE | cut -d' ' -f 1)" aptget download apt --print-uris
+testequal "'file://${DEBFILE}' apt_2.0_all.deb $(stat -c%s $DEBFILE) sha512:$(sha512sum $DEBFILE | cut -d' ' -f 1)" aptget download apt --print-uris
# deb:677887
testequal "E: Can't find a source to download version '1.0' of 'vrms:i386'" aptget download vrms