include two missing patches to really fix bug #696225, thanks to

Guillem Jover

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 17a6b70e91c92886cd2c379f2e6e848bbd087463..916e1d730a7abf76153813c6304c5fdcb987b7c7 100644 (file)
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -192,7 +192,7 @@ void OpTextProgress::Update()
    }
    
    // Print the spinner
    }
    
    // Print the spinner

-   snprintf(S,sizeof(S),_("\r%s... %u%%"),Op.c_str(),(unsigned int)Percent);
+   snprintf(S,sizeof(S),_("%c%s... %u%%"),'\r',Op.c_str(),(unsigned int)Percent);

    Write(S);
 
    OldOp = Op;
    Write(S);
 
    OldOp = Op;

diff --git a/debian/changelog b/debian/changelog
index 97587b6bfa8665367ed0816d49c634bbadf12b32..ff4988d63e8b40ef0144dfcc591493dbcfb6e530 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.9.7.8~exp2) UNRELEASEDexperimental; urgency=low
+
+  * include two missing patches to really fix bug #696225, thanks to
+    Guillem Jover 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 01 Mar 2013 18:50:17 +0100
+

 apt (0.9.7.8~exp1) experimental; urgency=low
 
   [ Manpages translation updates ]
 apt (0.9.7.8~exp1) experimental; urgency=low
 
   [ Manpages translation updates ]

diff --git a/po/ca.po b/po/ca.po
index 03d11e1aad43dc8cc37fffe88f469d4447462ea4..61d23127763ef91607aa99b42e696a726be5fd63 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -2403,6 +2403,16 @@ msgstr "%c%s… Error!"
 msgid "%c%s... Done"
 msgstr "%c%s… Fet"
 
 msgid "%c%s... Done"
 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."
 #: 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 4ccb2f70bf409dda13cba32e9fc0e34cb82192c9..3d16d6811a3e12d56f9eea34eab1c6b1f788cbb4 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -2399,6 +2399,16 @@ msgstr "%c%s… Chyba!"
 msgid "%c%s... Done"
 msgstr "%c%s… Hotovo"
 
 msgid "%c%s... Done"
 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."
 #: 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 c60c9a384411239612ac6a0ec5ccb00ac62c2e28..9b66cc268384962159992fdb53ca09bc65acfd37 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -2457,6 +2457,16 @@ msgstr "%c%s… Ошибка!"
 msgid "%c%s... Done"
 msgstr "%c%s… Готово"
 
 msgid "%c%s... Done"
 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."
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."