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

- Change metapackages to {restricted,universe,multiverse}/metapackages in Install-Recommends-Sections and Never-MarkAuto-Sections
15 years ago · 3e8bdb6fe2
6 changed files with 24 additions and 5 deletions
--- a/configure.in
+++ b/configure.in
@ -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.4ubuntu1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
--- a/debian/apt.conf.autoremove
+++ b/debian/apt.conf.autoremove
@ -7,6 +7,11 @@ APT
 	"^linux-ubuntu-modules-.*";
  };

-  Install-Recommends-Section "*metapackages";
-  Never-MarkAuto-Section "*metapackages";
+  Never-MarkAuto-Sections
+  { 
+	"metapackages";
+        "restricted/metapackages";
+        "universe/metapackages";
+        "multiverse/metapackages";
+  };
 };
--- a/debian/apt.conf.ubuntu
+++ b/debian/apt.conf.ubuntu
@ -0,0 +1,10 @@
+APT
+{
+  Install-Recommends-Sections
+  { 
+	"metapackages"; 
+	"restricted/metapackages";
+	"universe/metapackages";
+	"multiverse/metapackages";
+  };
+};
--- a/debian/changelog
+++ b/debian/changelog
@ -1,4 +1,4 @@
-apt (0.7.4ubuntu1) UNRELEASED; urgency=low
+apt (0.7.4ubuntu1) gutsy; urgency=low

  [ Otavio Salvador ]
  * Applied patch from Guillem Jover <guillem.jover@nokia.com> to use
@ -9,6 +9,9 @@ apt (0.7.4ubuntu1) UNRELEASED; urgency=low
    - 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

 -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Jul 2007 10:42:29 +0200

--- a/debian/rules
+++ b/debian/rules
@ -212,6 +212,7 @@ apt: build debian/shlibs.local

 	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
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@ -101,7 +101,7 @@ APT
  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"; };