2006-11-27 Darren Kenny <[email protected]> gnome-2-16
authordkenny
Mon, 27 Nov 2006 12:45:09 +0000
branchgnome-2-16
changeset 18973 82c6b7a0ee41
parent 18972 cb9b69e467fd
child 18974 470886050c22
2006-11-27 Darren Kenny <[email protected]> * patches/system-tools-backends-05-services.diff: Remove a dependency on print.pl which was removed from the pkgmap file.
ChangeLog
patches/system-tools-backends-05-services.diff
--- a/ChangeLog	Mon Nov 27 12:18:11 2006 +0000
+++ b/ChangeLog	Mon Nov 27 12:45:09 2006 +0000
@@ -1,3 +1,8 @@
+2006-11-27  Darren Kenny  <[email protected]>
+
+	* patches/system-tools-backends-05-services.diff:
+	  Remove a dependency on print.pl which was removed from the pkgmap file.
+
 2006-11-27  Damien Carbery <[email protected]>
 
 	==== Vermillion Devel build 54b ====
--- a/patches/system-tools-backends-05-services.diff	Mon Nov 27 12:18:11 2006 +0000
+++ b/patches/system-tools-backends-05-services.diff	Mon Nov 27 12:45:09 2006 +0000
@@ -1,6 +1,15 @@
---- /usr/tmp/clean/system-tools-backends-1.4.2/services-conf.in	2006-01-02 15:32:34.000000000 +0000
-+++ system-tools-backends-1.4.2/services-conf.in	2006-04-18 13:48:12.871683000 +0100
-@@ -51,6 +51,7 @@
+diff -u system-tools-backends-1.4.2/services-conf.in-orig system-tools-backends-1.4.2/services-conf.in
+--- system-tools-backends-1.4.2/services-conf.in-orig	Mon Jan  2 15:32:34 2006
++++ system-tools-backends-1.4.2/services-conf.in	Mon Nov 27 12:33:24 2006
+@@ -35,7 +35,6 @@
+   require "$SCRIPTSDIR/general.pl$DOTIN";
+   require "$SCRIPTSDIR/platform.pl$DOTIN";
+   require "$SCRIPTSDIR/service.pl$DOTIN";
+-  require "$SCRIPTSDIR/print.pl$DOTIN";
+ }
+ 
+ # --- Tool information --- #
+@@ -51,6 +50,7 @@
                
                "debian-2.2", "debian-3.0", "debian-sarge",
  
@@ -8,7 +17,7 @@
                "suse-7.0", "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "rpath",
                "pld-1.0", "pld-1.1", "pld-1.99",
                "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
-@@ -91,6 +92,7 @@
+@@ -91,6 +91,7 @@
    {
      if ($elem eq "runlevels") { $runlevel = &xml_parse_runlevel_list (shift @$tree)}
      elsif ($elem eq "services") { push @$services, &xml_parse_service_list (shift @$tree); }
@@ -16,7 +25,7 @@
      else { &gst_report ("xml_unexp_tag", $elem); shift @$tree; }
    }
  
-@@ -173,6 +175,7 @@
+@@ -173,6 +174,7 @@
      elsif ($elem eq "role") { shift @$tree }
      elsif ($elem eq "runlevels") { push @$runlevels, &xml_parse_runlevels (shift @$tree); }
      elsif ($elem eq "script") { $$hash{"script"} = &gst_xml_get_pcdata (shift @$tree); }
@@ -24,7 +33,7 @@
      else { &gst_report ("xml_unexp_tag", $elem); shift @$tree; }
    }
    
-@@ -260,6 +263,7 @@
+@@ -260,6 +262,7 @@
  sub xml_print_runlevels
  {
    my ($h, $default) = @_;
@@ -32,6 +41,7 @@
    &gst_xml_print_line ("<runlevels>");
    &gst_xml_enter ();
  
+ 
 diff -u system-tools-backends-1.4.2/service.pl.in-orig system-tools-backends-1.4.2/service.pl.in
 --- system-tools-backends-1.4.2/service.pl.in-orig	2006-08-30 10:38:46.297299000 +0100
 +++ system-tools-backends-1.4.2/service.pl.in	2006-08-30 10:19:57.781424000 +0100