Merge lp:~jr/ubuntu/oneiric/apt/bzr-get-rename into lp:ubuntu/oneiric/apt

[Jonathan Riddell]

  * Replace deprecated bzr command alias "get" with "branch"

[Michael Vogt (mvo)]

Thanks, I merged this into trunk now. Please set the branch to merged, its in
http://bazaar.launchpad.net/~ubuntu-core-dev/apt/ubuntu/revision/1912

review: Approve

=== modified file 'cmdline/apt-get.cc'
--- cmdline/apt-get.cc	2011-06-29 09:03:39 +0000
+++ cmdline/apt-get.cc	2011-08-11 15:51:29 +0000
@@ -2414,7 +2414,7 @@
 		  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());
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-13 14:42:02 +0000
+++ debian/changelog	2011-08-11 15:51:29 +0000
@@ -1,3 +1,9 @@
+apt (0.8.15.1ubuntu3) oneiric; urgency=low
+
+  * Replace deprecated bzr command alias "get" with "branch"
+
+ -- Jonathan Riddell <[e-mail]>  Thu, 11 Aug 2011 16:46:44 +0100
+
 apt (0.8.15.1ubuntu2) oneiric; urgency=low
 
   [ Brian Murray ]
 
=== modified file 'po/ar.po'
--- po/ar.po	2011-07-13 14:42:02 +0000
+++ po/ar.po	2011-08-11 15:51:29 +0000
@@ -1100,7 +1100,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/ast.po'
--- po/ast.po	2011-07-13 14:42:02 +0000
+++ po/ast.po	2011-08-11 15:51:29 +0000
@@ -1212,11 +1212,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Por favor, usa:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal "
 "paquete.\n"
 
 
=== modified file 'po/bg.po'
--- po/bg.po	2011-07-13 14:42:02 +0000
+++ po/bg.po	2011-08-11 15:51:29 +0000
@@ -1230,11 +1230,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Използвайте:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "за да изтеглите последните промени в пакета (евентуално в процес на "
 "разработка).\n"
 
 
=== modified file 'po/bs.po'
--- po/bs.po	2011-07-13 14:42:02 +0000
+++ po/bs.po	2011-08-11 15:51:29 +0000
@@ -1102,7 +1102,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/ca.po'
--- po/ca.po	2011-07-13 14:42:02 +0000
+++ po/ca.po	2011-08-11 15:51:29 +0000
@@ -1225,11 +1225,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Empreu:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "per a obtenir les últimes actualitzacions (possiblement no publicades) del "
 "paquet.\n"
 
 
=== modified file 'po/cs.po'
--- po/cs.po	2011-07-13 14:42:02 +0000
+++ po/cs.po	2011-08-11 15:51:29 +0000
@@ -1214,12 +1214,12 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Pro stažení nejnovějších (možná dosud nevydaných) aktualizací balíku prosím "
 "použijte:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 
 #: cmdline/apt-get.cc:2469
 #, c-format
 
=== modified file 'po/cy.po'
--- po/cy.po	2011-07-13 14:42:02 +0000
+++ po/cy.po	2011-08-11 15:51:29 +0000
@@ -1247,7 +1247,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/da.po'
--- po/da.po	2011-07-13 14:42:02 +0000
+++ po/da.po	2011-08-11 15:51:29 +0000
@@ -1221,11 +1221,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Brug venligst:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
 
 #: cmdline/apt-get.cc:2469
 
=== modified file 'po/de.po'
--- po/de.po	2011-07-13 14:42:02 +0000
+++ po/de.po	2011-08-11 15:51:29 +0000
@@ -1248,11 +1248,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Bitte verwenden Sie:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "um die neuesten (möglicherweise noch unveröffentlichten) Aktualisierungen\n"
 "für das Paket abzurufen.\n"
 
 
=== modified file 'po/dz.po'
--- po/dz.po	2011-07-13 14:42:02 +0000
+++ po/dz.po	2011-08-11 15:51:29 +0000
@@ -1222,7 +1222,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/el.po'
--- po/el.po	2011-07-13 14:42:02 +0000
+++ po/el.po	2011-08-11 15:51:29 +0000
@@ -1245,7 +1245,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/es.po'
--- po/es.po	2011-07-13 14:42:02 +0000
+++ po/es.po	2011-08-11 15:51:29 +0000
@@ -1290,11 +1290,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Por favor, utilice:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
 "del paquete.\n"
 
 
=== modified file 'po/eu.po'
--- po/eu.po	2011-07-13 14:42:02 +0000
+++ po/eu.po	2011-08-11 15:51:29 +0000
@@ -1217,7 +1217,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/fi.po'
--- po/fi.po	2011-07-13 14:42:02 +0000
+++ po/fi.po	2011-08-11 15:51:29 +0000
@@ -1218,7 +1218,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/fr.po'
--- po/fr.po	2011-07-13 14:42:02 +0000
+++ po/fr.po	2011-08-11 15:51:29 +0000
@@ -1248,11 +1248,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Veuillez utiliser la commande :\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "pour récupérer les dernières mises à jour (éventuellement non encore "
 "publiées) du paquet.\n"
 
 
=== modified file 'po/gl.po'
--- po/gl.po	2011-07-13 14:42:02 +0000
+++ po/gl.po	2011-08-11 15:51:29 +0000
@@ -1230,11 +1230,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Empregue:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "para obter as últimas actualizacións (posibelmente non publicadas) do "
 "paquete.\n"
 
 
=== modified file 'po/hu.po'
--- po/hu.po	2011-07-13 14:42:02 +0000
+++ po/hu.po	2011-08-11 15:51:29 +0000
@@ -1208,7 +1208,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/it.po'
--- po/it.po	2011-07-13 14:42:02 +0000
+++ po/it.po	2011-08-11 15:51:29 +0000
@@ -1236,11 +1236,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Usare:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "per recuperare gli ultimi (e probabilmente non rilasciati) aggiornamenti del "
 "pacchetto.\n"
 
 
=== modified file 'po/ja.po'
--- po/ja.po	2011-07-13 14:42:02 +0000
+++ po/ja.po	2011-08-11 15:51:29 +0000
@@ -1228,12 +1228,12 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "パッケージの最新の (まだリリースされていないかもしれない) 更新を取得するに"
 "は、\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "を使用してください。\n"
 
 #: cmdline/apt-get.cc:2469
 
=== modified file 'po/km.po'
--- po/km.po	2011-07-13 14:42:02 +0000
+++ po/km.po	2011-08-11 15:51:29 +0000
@@ -1209,7 +1209,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/ko.po'
--- po/ko.po	2011-07-13 14:42:02 +0000
+++ po/ko.po	2011-08-11 15:51:29 +0000
@@ -1209,12 +1209,12 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "패키지의 최근 (아마도 릴리스되지 않은) 업데이트를 받으려면\n"
 "다음과 같이 하십시오:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 
 #: cmdline/apt-get.cc:2469
 #, c-format
 
=== modified file 'po/ku.po'
--- po/ku.po	2011-07-13 14:42:02 +0000
+++ po/ku.po	2011-08-11 15:51:29 +0000
@@ -1104,7 +1104,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/lt.po'
--- po/lt.po	2011-07-13 14:42:02 +0000
+++ po/lt.po	2011-08-11 15:51:29 +0000
@@ -1178,7 +1178,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/mr.po'
--- po/mr.po	2011-07-13 14:42:02 +0000
+++ po/mr.po	2011-08-11 15:51:29 +0000
@@ -1208,7 +1208,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/nb.po'
--- po/nb.po	2011-07-13 14:42:02 +0000
+++ po/nb.po	2011-08-11 15:51:29 +0000
@@ -1224,11 +1224,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Bruk:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
 
 #: cmdline/apt-get.cc:2469
 
=== modified file 'po/ne.po'
--- po/ne.po	2011-07-13 14:42:02 +0000
+++ po/ne.po	2011-08-11 15:51:29 +0000
@@ -1208,7 +1208,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/nl.po'
--- po/nl.po	2011-07-13 14:42:02 +0000
+++ po/nl.po	2011-08-11 15:51:29 +0000
@@ -1231,7 +1231,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/nn.po'
--- po/nn.po	2011-07-13 14:42:02 +0000
+++ po/nn.po	2011-08-11 15:51:29 +0000
@@ -1218,7 +1218,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/pl.po'
--- po/pl.po	2011-07-13 14:42:02 +0000
+++ po/pl.po	2011-08-11 15:51:29 +0000
@@ -1229,7 +1229,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/pt.po'
--- po/pt.po	2011-07-13 14:42:02 +0000
+++ po/pt.po	2011-08-11 15:51:29 +0000
@@ -1222,11 +1222,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Por favor utilize:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n"
 
 #: cmdline/apt-get.cc:2469
 
=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2011-07-13 14:42:02 +0000
+++ po/pt_BR.po	2011-08-11 15:51:29 +0000
@@ -1227,7 +1227,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/ro.po'
--- po/ro.po	2011-07-13 14:42:02 +0000
+++ po/ro.po	2011-08-11 15:51:29 +0000
@@ -1232,7 +1232,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/ru.po'
--- po/ru.po	2011-07-13 14:42:02 +0000
+++ po/ru.po	2011-08-11 15:51:29 +0000
@@ -1243,11 +1243,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Используйте:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "для получения последних (возможно не выпущенных) обновлений пакета.\n"
 
 #: cmdline/apt-get.cc:2469
 
=== modified file 'po/sk.po'
--- po/sk.po	2011-07-13 14:42:02 +0000
+++ po/sk.po	2011-08-11 15:51:29 +0000
@@ -1224,11 +1224,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Prosím, použite:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "ak chcete získať najnovšie (a pravdepodobne zatiaľ nevydané) aktualizácie "
 "balíka.\n"
 
 
=== modified file 'po/sl.po'
--- po/sl.po	2011-07-13 14:42:02 +0000
+++ po/sl.po	2011-08-11 15:51:29 +0000
@@ -1225,11 +1225,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Uporabite:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "za pridobivanje zadnjih (morda neizdanih) posodobitev paketa.\n"
 
 #: cmdline/apt-get.cc:2469
 
=== modified file 'po/sv.po'
--- po/sv.po	2011-07-13 14:42:02 +0000
+++ po/sv.po	2011-08-11 15:51:29 +0000
@@ -1228,11 +1228,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Använd:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n"
 
 #: cmdline/apt-get.cc:2469
 
=== modified file 'po/th.po'
--- po/th.po	2011-07-13 14:42:02 +0000
+++ po/th.po	2011-08-11 15:51:29 +0000
@@ -1198,7 +1198,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/tl.po'
--- po/tl.po	2011-07-13 14:42:02 +0000
+++ po/tl.po	2011-08-11 15:51:29 +0000
@@ -1227,7 +1227,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/uk.po'
--- po/uk.po	2011-07-13 14:42:02 +0000
+++ po/uk.po	2011-08-11 15:51:29 +0000
@@ -1232,7 +1232,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'po/vi.po'
--- po/vi.po	2011-07-13 14:42:02 +0000
+++ po/vi.po	2011-08-11 15:51:29 +0000
@@ -1240,11 +1240,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Hãy sử dụng câu lệnh:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "để lấy các bản cập nhật gói mới nhất (có thể là chưa phát hành).\n"
 
 #: cmdline/apt-get.cc:2469
 
=== modified file 'po/zh_CN.po'
--- po/zh_CN.po	2011-07-13 14:42:02 +0000
+++ po/zh_CN.po	2011-08-11 15:51:29 +0000
@@ -1197,11 +1197,11 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "请使用：\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "获得该软件包的最近更新(可能尚未正式发布)。\n"
 
 #: cmdline/apt-get.cc:2469
 
=== modified file 'po/zh_TW.po'
--- po/zh_TW.po	2011-07-13 14:42:02 +0000
+++ po/zh_TW.po	2011-08-11 15:51:29 +0000
@@ -1200,7 +1200,7 @@
 #, c-format
 msgid ""
 "Please use:\n"
-"bzr get %s\n"
+"bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 
=== modified file 'test/pre-upload-check.py'
--- test/pre-upload-check.py	2010-07-30 19:32:15 +0000
+++ test/pre-upload-check.py	2011-08-11 15:51:29 +0000
@@ -115,7 +115,7 @@
     """
     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