merged lp:~jr/ubuntu/oneiric/apt/bzr-get-rename, thanks to

Jonathan Riddell

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 0cc6c04fcf111803f358b26a7a5670c6f0172113..2c84176fcb1dd4aa6b1d025e46abeab5c441ae1d 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2430,7 +2430,7 @@ bool DoSource(CommandLine &CmdL)
                  Src.c_str(), vcs.c_str(), uri.c_str());
         if(vcs == "Bzr") 
            ioprintf(c1out,_("Please use:\n"
                  Src.c_str(), vcs.c_str(), uri.c_str());
         if(vcs == "Bzr") 
            ioprintf(c1out,_("Please use:\n"

-                            "bzr get %s\n"
+                            "bzr branch %s\n"

                             "to retrieve the latest (possibly unreleased) "
                             "updates to the package.\n"),
                     uri.c_str());
                             "to retrieve the latest (possibly unreleased) "
                             "updates to the package.\n"),
                     uri.c_str());

diff --git a/debian/changelog b/debian/changelog
index d05fa280b753ab83fabbb745ef86d9788756370a..a0fb6e0fa6770a3521edc663432060e944259f4c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.8.16~exp5ubuntu6) UNRELEASED; urgency=low
+
+  * merged lp:~jr/ubuntu/oneiric/apt/bzr-get-rename, thanks to
+    Jonathan Riddell
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 11 Aug 2011 18:09:45 +0200
+

 apt (0.8.16~exp5ubuntu5) oneiric; urgency=low
 
   * debian/control:
 apt (0.8.16~exp5ubuntu5) oneiric; urgency=low
 
   * debian/control:

diff --git a/test/pre-upload-check.py b/test/pre-upload-check.py
index f9da8f941eaedc93c507354c92a1c8f044339a73..e79c8e8001ef724f784f71756078b362a640119c 100755 (executable)
--- a/test/pre-upload-check.py
+++ b/test/pre-upload-check.py
@@ -115,7 +115,7 @@ class testAuthentication(unittest.TestCase):
     """
     test if the authentication is working, the repository
     of the test-data can be found here:
     """
     test if the authentication is working, the repository
     of the test-data can be found here:

-    bzr get http://people.ubuntu.com/~mvo/bzr/apt/apt-auth-test-suit/
+    bzr branch http://people.ubuntu.com/~mvo/bzr/apt/apt-auth-test-suit/

     """
     
     # some class wide data
     """
     
     # some class wide data