Merge lp:~jelmer/bzr-builddeb/apt-directory into lp:bzr-builddeb

[Jelmer Vernooij]

[lp:~jelmer/bzr-builddeb/apt-directory]

515. By Jelmer Vernooij on 2011-02-06

update news/changelog

[James Westby (james-w)]

review: Approve

[Jelmer Vernooij (jelmer)]

This renames the 'deb:' directory service to 'apt:'. This more clearly reflects where the data is coming from, and should prevent confusion with the directory service meaning "debian", which is not the case on ubuntu.

=== modified file '__init__.py'
--- __init__.py	2011-01-13 18:14:01 +0000
+++ __init__.py	2011-02-06 13:28:10 +0000
@@ -80,7 +80,7 @@
 default_result_dir = '..'
 
 
-directories.register_lazy("deb:", 'bzrlib.plugins.builddeb.directory', 
+directories.register_lazy("apt:", 'bzrlib.plugins.builddeb.directory', 
         'VcsDirectory', 
         "Directory that uses Debian Vcs-* control fields to look up branches")
 

=== modified file 'debian/NEWS'
--- debian/NEWS	2009-03-05 12:59:30 +0000
+++ debian/NEWS	2011-02-06 13:28:10 +0000
@@ -1,3 +1,9 @@
+bzr-builddeb (2.5.1) unstable; urgency=low
+
+  The 'deb:' directory service has been renamed to 'apt:' to avoid confusion.
+
+ -- Jelmer Vernooij <[e-mail]>  Sun, 06 Feb 2011 14:24:37 +0100
+
 bzr-builddeb (2.1) experimental; urgency=low
 
   * The build command now defaults to "debuild" instead of

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-03 22:45:27 +0000
+++ debian/changelog	2011-02-06 13:28:10 +0000
@@ -49,8 +49,10 @@
   * Fix build dependencies for test suite.
   * Support unversioned debian/ symlink in working tree when finding
     changelog and larstiq mode. LP: #619295
+  * The deb: directory service has been renamed to apt: to avoid
+    confusion.
 
- -- Jelmer Vernooij <[e-mail]>  Thu, 03 Feb 2011 14:38:04 +0100
+ -- Jelmer Vernooij <[e-mail]>  Sun, 06 Feb 2011 14:25:32 +0100
 
 bzr-builddeb (2.5) unstable; urgency=low