[Fai-commit] r5709 - people/michael/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2010-01-27 16:45:21 +0000 (Wed, 27 Jan 2010)
New Revision: 5709

Removed:
   people/michael/experimental/patches/bugfix-556082
   people/michael/experimental/patches/bugfix-558139
Modified:
   people/michael/experimental/patches/logtail
   people/michael/experimental/patches/series
Log:
removing patches that were merged into trunk


Deleted: people/michael/experimental/patches/bugfix-556082
===================================================================
--- people/michael/experimental/patches/bugfix-556082	2010-01-27 12:28:26 UTC (rev 5708)
+++ people/michael/experimental/patches/bugfix-556082	2010-01-27 16:45:21 UTC (rev 5709)
@@ -1,17 +0,0 @@
-2009-11-22  Michael Tautschnig  <mt at debian.org>
-
-	* control: Build-dep-indep on asciidoc (>= 8.3) | lynx in addition to asciidoc
-		to ensure proper build on lenny systems. (closes: #556082)
-Index: trunk/debian/control
-===================================================================
---- trunk.orig/debian/control
-+++ trunk/debian/control	
-@@ -4,7 +4,7 @@
- Maintainer: Thomas Lange <lange at debian.org>
- Uploaders: Holger Levsen <holger at debian.org>
- Standards-Version: 3.8.3
--Build-Depends-Indep: asciidoc, w3m, dblatex, docbook-xsl
-+Build-Depends-Indep: asciidoc, asciidoc (>= 8.3) | lynx, w3m, dblatex, docbook-xsl
- Build-Depends: debhelper (>= 7)
- Vcs-Svn: svn://svn.debian.org/svn/fai/trunk
- Vcs-Browser: http://svn.debian.org/wsvn/fai

Deleted: people/michael/experimental/patches/bugfix-558139
===================================================================
--- people/michael/experimental/patches/bugfix-558139	2010-01-27 12:28:26 UTC (rev 5708)
+++ people/michael/experimental/patches/bugfix-558139	2010-01-27 16:45:21 UTC (rev 5709)
@@ -1,17 +0,0 @@
-2009-11-30  Michael Tautschnig  <mt at debian.org>
-
-	* install_packages: Make aptitude-r method handle MAX_PACKAGES (thanks Stefan
-		Goetz). (closes: #558139)
-Index: trunk/bin/install_packages
-===================================================================
---- trunk.orig/bin/install_packages
-+++ trunk/bin/install_packages	
-@@ -187,7 +187,7 @@
-     next;
-   }
- 
--  if ($atype eq "install" || $atype eq "smarti" || $atype eq "aptitude" || $atype eq "unpack" || $opt_l || $opt_L) {
-+  if ($atype eq "install" || $atype eq "smarti" || $atype eq "aptitude" || $atype eq "aptitude-r" || $atype eq "unpack" || $opt_l || $opt_L) {
- 
-     mkpackagelist(@{$list{$atype}}); # create lists of known and unknown packages
-     if ($opt_l) {

Modified: people/michael/experimental/patches/logtail
===================================================================
--- people/michael/experimental/patches/logtail	2010-01-27 12:28:26 UTC (rev 5708)
+++ people/michael/experimental/patches/logtail	2010-01-27 16:45:21 UTC (rev 5709)
@@ -46,7 +46,7 @@
  }
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  jobsrunning() {
-@@ -424,6 +428,7 @@
+@@ -428,6 +432,7 @@
  task_savelog() {
  
      mkdir -p $FAI_ROOT/var/{lib,log}/fai

Modified: people/michael/experimental/patches/series
===================================================================
--- people/michael/experimental/patches/series	2010-01-27 12:28:26 UTC (rev 5708)
+++ people/michael/experimental/patches/series	2010-01-27 16:45:21 UTC (rev 5709)
@@ -5,7 +5,5 @@
 bugfix-479537
 setup-storage_no-cylinder-boundaries
 bugfix-514160
-bugfix-556082
 setup-storage_lvm-preserve2
-bugfix-558139
 setup-storage_GIB-support