[Fai-commit] r4371 - in people/h01ger/softupdate-git-rpm: bin debian

[h01ger-guest at alioth.debian.org]

Author: h01ger-guest
Date: 2007-07-04 14:28:54 +0000 (Wed, 04 Jul 2007)
New Revision: 4371

Modified:
   people/h01ger/softupdate-git-rpm/bin/install_packages
   people/h01ger/softupdate-git-rpm/debian/changelog
   people/h01ger/softupdate-git-rpm/debian/control
Log:

  * added alternative build deps to texlive-base-bin and texlive-latex-extra
  * Hack around in install_packages so it doesnt depend on libapt-pkg-perl.
    It stays as a Depends: as alien/rpm doesnt consider this field anyway,
    and the Depends: is needed on Debian systems.



Modified: people/h01ger/softupdate-git-rpm/bin/install_packages
===================================================================
--- people/h01ger/softupdate-git-rpm/bin/install_packages	2007-07-04 10:55:38 UTC (rev 4370)
+++ people/h01ger/softupdate-git-rpm/bin/install_packages	2007-07-04 14:28:54 UTC (rev 4371)
@@ -32,9 +32,21 @@
 
 use strict;
 use Getopt::Std;
-use AptPkg::Config '$_config';
-use AptPkg::System '$_system';
-use AptPkg::Cache;
+use vars qw/$aptpkg_avail/;
+$aptpkg_avail=1;
+	unless (eval 	"require AptPkg::Config") {
+		$aptpkg_avail=-1;
+	}
+	eval 	"require AptPkg::System";
+	eval 	"require AptPkg::Cache";
+my $_config;
+my $_system;
+if ($aptpkg_avail==1) { 
+		eval	'import AptPkg::Config $_config';
+		eval 	'import AptPkg::System $_system';
+		eval 	'import AptPkg::Cache';
+}
+if ($aptpkg_avail==1) { print "this is a debian system\n"; }
 
 # global variables
 our ($opt_d,$opt_l,$opt_L,$opt_v,$opt_h,$opt_t,$opt_m,$opt_p);
@@ -113,11 +125,13 @@
 @classes = grep { !/^#|^\s*$/ } split(/[\s\n]+/,$ENV{classes});
 foreach (@classes) { $classisdef{$_}=1;}
 
-$_config->init;                 # initialize AptPkg
-$_config->set("Dir",$FAI_ROOT); # simulate "chroot"
-$_config->{quiet}=2;            # don't show cache initialization messages
-$_system = $_config->system;
-$cache = new AptPkg::Cache;
+if ($aptpkg_avail==1) {
+	$_config->init;                 # initialize AptPkg
+	$_config->set("Dir",$FAI_ROOT); # simulate "chroot"
+	$_config->{quiet}=2;            # don't show cache initialization messages
+	$_system = $_config->system;
+	$cache = new AptPkg::Cache;
+}
 
 # read all package config files
 foreach (@classes) {
@@ -211,14 +225,15 @@
   unlink $file || warn "Can't remove $file\n";
 }
 
-
-# in case of unconfigured packages because of apt errors
-# retry configuration
-execute("$rootcmd $command{pending}");
-# check if all went right
-execute("$rootcmd $command{dpkgc}");
-# clean apt cache
-execute("$rootcmd $command{clean}");
+if ($aptpkg_avail==1) {
+	# in case of unconfigured packages because of apt errors
+	# retry configuration
+	execute("$rootcmd $command{pending}");
+	# check if all went right
+	execute("$rootcmd $command{dpkgc}");
+	# clean apt cache
+	execute("$rootcmd $command{clean}");
+}
 # - - - - - - - - - - - - - - - - - - - - - - - - - - -
 sub readconfig {
 

Modified: people/h01ger/softupdate-git-rpm/debian/changelog
===================================================================
--- people/h01ger/softupdate-git-rpm/debian/changelog	2007-07-04 10:55:38 UTC (rev 4370)
+++ people/h01ger/softupdate-git-rpm/debian/changelog	2007-07-04 14:28:54 UTC (rev 4371)
@@ -1,3 +1,17 @@
+fai (3.1.8-0.rpm-holger.3) unstable; urgency=low
+
+  * added alternative build deps to texlive-base-bin and texlive-latex-extra
+
+ -- Holger Levsen <holger at debian.org>  Mon, 11 Jun 2007 21:20:40 +0100
+
+fai (3.1.8-0.holger.3) unstable; urgency=low
+
+  * Hack around in install_packages so it doesnt depend on libapt-pkg-perl.
+    It stays as a Depends: as alien/rpm doesnt consider this field anyway,
+    and the Depends: is needed on Debian systems.
+
+ -- Holger Levsen <holger at debian.org>  Thu,  3 May 2007 19:29:21 +0200
+
 fai (3.1.8-0.holger.2) unstable; urgency=low
 
   * make svn+ssh work with a username again

Modified: people/h01ger/softupdate-git-rpm/debian/control
===================================================================
--- people/h01ger/softupdate-git-rpm/debian/control	2007-07-04 10:55:38 UTC (rev 4370)
+++ people/h01ger/softupdate-git-rpm/debian/control	2007-07-04 14:28:54 UTC (rev 4371)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Thomas Lange <lange at debian.org>
 Standards-Version: 3.7.2
-Build-Depends-Indep: debiandoc-sgml, tetex-bin, tetex-extra
+Build-Depends-Indep: debiandoc-sgml, tetex-bin|texlive-base-bin, tetex-extra|texlive-latex-extra
 Build-Depends: debhelper (>= 4.1.16)
 XS-Vcs-Svn: svn://svn.debian.org/svn/fai/trunk