Merge branch 'debian/sid' into feature/apt-manpage

diff --combined cmdline/apt.cc
index b2f19c0496b481155ac2760a6afc6d37a5636910,4bcae0aba8ac71a07f9bc30d4e2679e899d83af7..5771e664f2c0ac4d32e26996d840e84baf74c6a8
--- 1/cmdline/apt.cc
--- 2/cmdline/apt.cc
+++ b/cmdline/apt.cc
@@@ -41,6 -41,7 +41,7 @@@
  #include <apt-pkg/pkgsystem.h>
  #include <apt-pkg/indexfile.h>
  #include <apt-pkg/metaindex.h>
+ #include <apt-pkg/hashes.h>
  
  #include <apti18n.h>
  
@@@ -54,8 -55,12 +55,12 @@@
  #include <apt-private/private-upgrade.h>
  #include <apt-private/private-show.h>
  #include <apt-private/private-main.h>
+ #include <apt-private/private-utils.h>
+ #include <apt-private/private-sources.h>
                                                                        /*}}}*/
  
+ 
+ 
  bool ShowHelp(CommandLine &CmdL)
  {
     ioprintf(c1out,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
@@@ -74,6 -79,8 +79,8 @@@
        " update - update list of available packages\n"
        " install - install packages\n"
        " upgrade - upgrade the systems packages\n"
+       "\n"
+       " edit-sources - edit the source information file\n"
         );
     
     return true;
@@@ -89,6 -96,8 +96,8 @@@ int main(int argc, const char *argv[]
                                     {"remove", &DoInstall},
                                     {"update",&DoUpdate},
                                     {"upgrade",&DoUpgradeWithAllowNewPackages},
+                                    // misc
+                                    {"edit-sources",&EditSources},
                                     // helper
                                     {"moo",&DoMoo},
                                     {"help",&ShowHelp},
@@@ -120,7 -129,7 +129,7 @@@
      }
  
     // FIXME: move into a new libprivate/private-install.cc:Install()
 -   _config->Set("DPkgPM::Progress", "1");
 +   _config->Set("DPkgPM::Progress-Fancy", "1");
     _config->Set("Apt::Color", "1");
  
     // Parse the command line and initialize the package library

diff --combined doc/apt-verbatim.ent
index 8581ec630b3dd9329f3007ff1e740beb8ce4e4c8,9a061e61d9adc059946a512bdecc7dd15830001b..459b18b6c0c81151fb1d7b4ceb37c5446eef2e7d
--- 1/doc/apt-verbatim.ent
--- 2/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@@ -219,14 -219,14 +219,14 @@@
  ">
  
  <!-- this will be updated by 'prepare-release' -->
- <!ENTITY apt-product-version "0.9.7.6ubuntu2">
+ <!ENTITY apt-product-version "0.9.14.2">
  
- <!-- Codenames for debian releases -->
+ <!-- (Code)names for various things used all over the place -->
  <!ENTITY oldstable-codename "squeeze">
  <!ENTITY stable-codename "wheezy">
  <!ENTITY testing-codename "jessie">
- <!ENTITY stable-version "7.0">
- <!ENTITY ubuntu-codename "precise">
+ <!ENTITY stable-version "7">
+ <!ENTITY ubuntu-codename "trusty">
  
  <!-- good and bad just refers to matching and not matching a pattern…
       It is not a remark about the specific perl version.
@@@ -247,24 -247,6 +247,24 @@@
  <!ENTITY synopsis-param-filename "<filename><replaceable>&synopsis-filename;</replaceable></filename>">
  <!ENTITY synopsis-help "<arg choice='plain'><group choice='req'><arg choice='plain'>-v</arg><arg choice='plain'>--version</arg></group></arg>
        <arg choice='plain'><group choice='req'><arg choice='plain'>-h</arg><arg choice='plain'>--help</arg></group></arg>">
 +<!ENTITY synopsis-command-apt "<refsynopsisdiv><cmdsynopsis>
 +      <command>apt</command>
 +      <arg><option>-h</option></arg>
 +      &synopsis-arg-option;
 +      &synopsis-arg-config;
 +      &synopsis-arg-target-release;
 +      &synopsis-arg-architecture;
 +      <group choice='req'>
 +              <arg choice='plain'>list</arg>
 +              <arg choice='plain'>search</arg>
 +              <arg choice='plain'>show</arg>
 +              <arg choice='plain'>update</arg>
 +              <arg choice='plain'>upgrade</arg>
 +              <arg choice='plain'>install &synopsis-arg-pkgver;</arg>
 +              <arg choice='plain'>remove &synopsis-arg-pkg;</arg>
 +              &synopsis-help;
 +      </group>
 +</cmdsynopsis></refsynopsisdiv>">
  <!ENTITY synopsis-command-apt-get "<refsynopsisdiv><cmdsynopsis>
        <command>apt-get</command>
        <arg><option>-asqdyfmubV</option></arg>

diff --combined doc/makefile
index fdbf53e9f405bdc31b3ffd46f4d9692215d760d4,4b63e542fa1d23a3258bd33b69231eaddcbf0f5c..e8d4c7ea5c1b42464c16e3a24af329f892a5f2e9
--- 1/doc/makefile
--- 2/doc/makefile
+++ b/doc/makefile
@@@ -12,8 -12,11 +12,11 @@@ include $(DEBIANDOC_H
  
  doc: manpages debiandoc
  
- examples/sources.list: examples/sources.list.in apt-verbatim.ent
-       sed -e 's#&stable-codename;#$(shell grep --max-count=1 '^<!ENTITY stable-codename "' apt-verbatim.ent | cut -d'"' -f 2)#g' examples/sources.list.in > examples/sources.list
+ examples/sources.list: ../vendor/current/sources.list
+       ln -sf $(shell readlink -f $^) $@
+ 
+ apt-vendor.ent: ../vendor/current/apt-vendor.ent
+       ln -sf $(shell readlink -f $^) $@
  
  # Examples
  SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
@@@ -23,9 -26,9 +26,9 @@@ include $(COPY_H
  
  .PHONY: clean clean/subdirs veryclean veryclean/subdirs manpages/subdirs debiandoc/subdirs all binary doc stats
  
- clean: clean/subdirs
- veryclean: veryclean/subdirs
- manpages: manpages/subdirs
+ clean: clean/subdirs clean/examples
+ veryclean: veryclean/subdirs clean/examples
+ manpages: apt-vendor.ent manpages/subdirs
  debiandoc: debiandoc/subdirs
  
  DOCUMENTATIONPO = $(patsubst %.po,%,$(notdir $(wildcard po/*.po)))
@@@ -41,6 -44,10 +44,10 @@@ debiandoc/subdirs manpages/subdirs clea
                $(MAKE) -C $$dir $(patsubst %/subdirs,%,$@); \
        done
  
+ clean/examples:
+       rm -f examples/sources.list
+       rm -f apt-vendor.ent
+ 
  stats:
        for i in po/*.po; do echo -n "$$i: "; msgfmt --output-file=/dev/null --statistics $$i; done
  
@@@ -59,9 -66,9 +66,9 @@@ update-po
  
  manpages/subdirs: $(MANPAGEPOLIST)
  $(MANPAGEPOLIST) :: manpages-translation-% : %/makefile po4a.conf
 -      # first line is for apt.8 (see Bug#696923)
 +      # first line is for apt.7 (see Bug#696923)
        po4a --previous --no-backups --translate-only $(dir $<)apt.ent \
 -              $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.8,%.$(subst /,,$(dir $<)).8,$(wildcard *.8))) \
 +              $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.7,%.$(subst /,,$(dir $<)).7,$(wildcard *.7))) \
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.1.xml,%.$(subst /,,$(dir $<)).1.xml,$(wildcard *.1.xml))) \
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.2.xml,%.$(subst /,,$(dir $<)).2.xml,$(wildcard *.2.xml))) \
                $(patsubst %,--translate-only $(dir $<)%,$(patsubst %.3.xml,%.$(subst /,,$(dir $<)).3.xml,$(wildcard *.3.xml))) \