From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 26 Jul 2007 10:18:24 +0000 (+0200)
Subject: * debian/apt.conf.ubuntu, apt.conf.autoremove:
X-Git-Tag: 0.7.24ubuntu1~165
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/3e8bdb6fe22d6feeca07d47e07c9b79ddd882c59

* debian/apt.conf.ubuntu, apt.conf.autoremove:
  - Change metapackages to {restricted,universe,multiverse}/metapackages
    in Install-Recommends-Sections and Never-MarkAuto-Sections
---

3e8bdb6fe22d6feeca07d47e07c9b79ddd882c59
diff --cc configure.in
index 609cedea4,ad913f53e..e86a5229b
--- a/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 f77e1cfbf,98143ce9a..63b69d5f6
--- a/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@@@ -4,9 -4,5 +4,14 @@@ AP
    { 
  	"^linux-image.*";  
  	"^linux-restricted-modules.*";
 +	"^linux-ubuntu-modules-.*";
 +  };
 +
-   Install-Recommends-Section "*metapackages";
-   Never-MarkAuto-Section "*metapackages";
++  Never-MarkAuto-Sections
++  { 
++	"metapackages";
++        "restricted/metapackages";
++        "universe/metapackages";
++        "multiverse/metapackages";
+   };
  };
diff --cc debian/apt.conf.ubuntu
index 000000000,000000000..0489faf98
new file mode 100644
--- /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 09454d1cd,8961a0257..bee947ae3
--- a/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 6ad6b7c84,473821f16..a330d6dc1
--- a/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 bd70d61ac,ab3657a58..711a77710
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@@ -100,9 -100,6 +100,9 @@@ AP
    Install-Recommends "false";
    Install-Suggests "false";
  
 +  // install recommends automatically for packages in this section
-   Install-Recommends-Section "*metapackages";
++  Install-Recommends-Section { "metapackages"; "universe/metapackages"; };
 +  
    // consider dependencies of packages in this section manual
    Never-MarkAuto-Sections {"metapackages"; "universe/metapackages"; };