* merged from debian-sid

* data/templates/Debian.info.in:
  - s/MatchUri/MatchURI/. Thanks, Gustavo Noronha Silva (closes: #487673)
* python/cache.cc:
  - Throw an exception rather than segfaulting when GetCache() is called
    before InitSystem() (closes: #369147)
* doc/examples/config.py:
  - Fix config.py --help (closes: #257007)
* python/apt_pkgmodule.cc:
  - fix bug in hashsum calculation when the original string
    contains \0 charackters (thanks to Celso Providelo and 
    Ryan Hass for the test-case) LP: #243630
* tests/test_hashsums.py:
  - add tests for the hashsum code
* apt/package.py:
  - add "isAutoRemovable()" method
* python/pkgsrcrecords.cc:
  - add "Record" attribute to the PkgSrcRecord to access the
    full source record
* debian/rules:
  - remove the arch-build target, we have bzr-builddeb now

1 files changed, 1 insertions, 2 deletions

diff --git a/doc/examples/config.py b/doc/examples/config.py
index 222c1331..24d90a0d 100755
--- a/doc/examples/config.py
+++ b/doc/examples/config.py
@@ -42,8 +42,7 @@ if Cnf.FindB("version",0) == 1:
    print "Version selected - 1.1";
 
 if Cnf.FindB("help",0) == 1:
-   print apt_pkg.Package,apt_pkg.Version,"for",apt_pkg.Architecture, \
-         "compiled on",apt_pkg.Date,apt_pkg.Time;
+   print "python-apt",apt_pkg.Version,"compiled on",apt_pkg.Date,apt_pkg.Time;
    print "Hi, I am the help text for this program";
    sys.exit(0);