* debian/apt.conf.ubuntu, apt.conf.autoremove:

  - Change metapackages to {restricted,universe,multiverse}/metapackages
    in Install-Recommends-Sections and Never-MarkAuto-Sections

diff --cc configure.in
index 609cedea400ebccb75ff94990799d17b84e2e628,ad913f53e6a18df04936c81a79ac8a8a291ae482..e86a5229b60b27f95305f294284aa76521f5badd
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu8")
 -AC_DEFINE_UNQUOTED(VERSION,"0.7.4")
++AC_DEFINE_UNQUOTED(VERSION,"0.7.4ubuntu1")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)

diff --cc debian/apt.conf.autoremove
index f77e1cfbfd982d2f19795c8a48a173a885ff1947,98143ce9a546276dfb9c5690b4366fc692b1d602..63b69d5f6607601ebacb5b06ad7f98f86fb26920
--- 1/debian/apt.conf.autoremove
--- 2/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@@@ -4,9 -4,5 +4,14 @@@ AP
    { 
        "^linux-image.*";  
        "^linux-restricted-modules.*";
-   Install-Recommends-Section "*metapackages";
-   Never-MarkAuto-Section "*metapackages";
 +      "^linux-ubuntu-modules-.*";
 +  };
 +
++  Never-MarkAuto-Sections
++  { 
++      "metapackages";
++        "restricted/metapackages";
++        "universe/metapackages";
++        "multiverse/metapackages";
+   };
  };

diff --cc debian/apt.conf.ubuntu
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0489faf987e48295d3e32bbca1db7645072f2428
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/apt.conf.ubuntu
@@@ -1,0 -1,0 +1,10 @@@
++APT
++{
++  Install-Recommends-Sections
++  { 
++      "metapackages"; 
++      "restricted/metapackages";
++      "universe/metapackages";
++      "multiverse/metapackages";
++  };
++};

diff --cc debian/changelog
index 09454d1cdb598fb39de3de8b600c2af9beecfeb8,8961a0257386417892408474bfc89abf2506f33e..bee947ae3dbf38d9d5407f61e6315d46a8a1802d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
- apt (0.7.4ubuntu1) UNRELEASED; urgency=low
 -apt (0.7.5) UNRELEASED; urgency=low
++apt (0.7.4ubuntu1) gutsy; urgency=low
  
    [ Otavio Salvador ]
    * Applied patch from Guillem Jover <guillem.jover@nokia.com> to use
@@@ -9,8 -9,8 +9,11 @@@
      - support a list of sections for:
        APT::Install-Recommends-Sections
        APT::Never-MarkAuto-Sections
++  * debian/apt.conf.ubuntu, apt.conf.autoremove:
++    - Change metapackages to {restricted,universe,multiverse}/metapackages 
++      in Install-Recommends-Sections and Never-MarkAuto-Sections
  
 - -- Otavio Salvador <otavio@ossystems.com.br>  Wed, 25 Jul 2007 20:16:46 -0300
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Jul 2007 10:42:29 +0200
  
  apt (0.7.4) unstable; urgency=low
  

diff --cc debian/rules
index 6ad6b7c842fbd0faeab2521afd07ff3cef48c97b,473821f16c2c731c7c48fd68de97f19373428b6e..a330d6dc173c5478ad62e8e14a0fcee422b0f017
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -210,8 -210,8 +210,9 @@@ apt: build debian/shlibs.loca
  
        cp debian/bugscript debian/$@/usr/share/bug/apt/script
  
 -      cp share/debian-archive.gpg debian/$@/usr/share/$@
 +      cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
        cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
++      cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu
  #     head -n 500 ChangeLog > debian/ChangeLog
  
        # make rosetta happy and remove pot files in po/ (but leave stuff

diff --cc doc/examples/configure-index
index bd70d61ac850acadedc058056f968dac0e079169,ab3657a586e595feef45864d050013bee62466dc..711a777109b96109c07312a363250699c240f5f6
--- 1/doc/examples/configure-index
--- 2/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -100,9 -100,6 +100,9 @@@ AP
    Install-Recommends "false";
    Install-Suggests "false";
  
-   Install-Recommends-Section "*metapackages";
 +  // install recommends automatically for packages in this section
++  Install-Recommends-Section { "metapackages"; "universe/metapackages"; };
 +  
    // consider dependencies of packages in this section manual
    Never-MarkAuto-Sections {"metapackages"; "universe/metapackages"; };