[kernel] r16014 - in dists/sid/linux-2.6/debian: . templates

[Ben Hutchings]

Author: benh
Date: Sat Jul 24 12:28:00 2010
New Revision: 16014

Log:
linux-base: Remove dependency on libapt-pkg-perl (Closes: #589996)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/linux-base.postinst
   dists/sid/linux-2.6/debian/templates/control.main.in

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri Jul 23 23:59:49 2010	(r16013)
+++ dists/sid/linux-2.6/debian/changelog	Sat Jul 24 12:28:00 2010	(r16014)
@@ -4,6 +4,9 @@
   * inotify send IN_UNMOUNT events.
   * inotify fix oneshot support.
 
+  [ Ben Hutchings ]
+  * linux-base: Remove dependency on libapt-pkg-perl (Closes: #589996)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 24 Jul 2010 00:41:51 +0100
 
 linux-2.6 (2.6.32-18) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/sid/linux-2.6/debian/linux-base.postinst	Fri Jul 23 23:59:49 2010	(r16013)
+++ dists/sid/linux-2.6/debian/linux-base.postinst	Sat Jul 24 12:28:00 2010	(r16014)
@@ -18,7 +18,6 @@
 
 use strict;
 use warnings;
-use AptPkg::Config;
 use Debconf::Client::ConfModule ':all';
 use FileHandle;
 use POSIX ();
@@ -1642,8 +1641,9 @@
 
 capb('escape');
 
-sub compare_versions {
-    return $AptPkg::Config::_config->system->versioning->compare(@_);
+sub version_lessthan {
+    my ($left, $right) = @_;
+    return system('dpkg', '--compare-versions', $left, 'lt', $right) == 0;
 }
 
 # No upgrade work is necessary during a fresh system installation.
@@ -1670,12 +1670,12 @@
 	($deb_arch eq 'i386' || $deb_arch eq 'amd64') ? '2.6.32-10' : '2.6.32-11';
     if ($ARGV[0] eq 'reconfigure' || defined($ENV{DEBCONF_RECONFIGURE}) ||
 	(!is_fresh_installation() &&
-	 compare_versions($ARGV[1], $libata_transition_ver) < 0)) {
+	 version_lessthan($ARGV[1], $libata_transition_ver))) {
 	DebianKernel::DiskId::transition();
     }
 }
 
-if (!is_fresh_installation() && compare_versions($ARGV[1], '2.6.32-18') < 0) {
+if (!is_fresh_installation() && version_lessthan($ARGV[1], '2.6.32-18')) {
     DebianKernel::BootloaderConfig::check($deb_arch);
 }
 

Modified: dists/sid/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.main.in	Fri Jul 23 23:59:49 2010	(r16013)
+++ dists/sid/linux-2.6/debian/templates/control.main.in	Sat Jul 24 12:28:00 2010	(r16014)
@@ -91,8 +91,7 @@
 
 Package: linux-base
 Architecture: all
-Depends: libapt-pkg-perl, libuuid-perl, ${misc:Depends},
- util-linux (>= 2.16-1) | udev (<< 146-1)
+Depends: libuuid-perl, ${misc:Depends}, util-linux (>= 2.16-1) | udev (<< 146-1)
 Description: Linux image base package
  This package contains files and support scripts for all Linux
  images.