Wed Jul 25 03:45:51 2001 Arturo Espinosa Aldama <arturo@ximian.com>

	* package-conf.in (get_package): missing comma.

	* mouse-conf.in: mouse.pl doesn't exist. Can't require it.

	* Makefile.am: Also s/___version___/$(VERSION)/.
	* *-conf.in: Removed arbitrary value for $version and
	assigned "___version___" instead. #3090 fixed.

15 files changed, 24 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index fad8dd4..00efe99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 Wed Jul 25 03:45:51 2001  Arturo Espinosa Aldama  <arturo@ximian.com>
 
+	* package-conf.in (get_package): missing comma.
+
+	* mouse-conf.in: mouse.pl doesn't exist. Can't require it.
+
+	* Makefile.am: Also s/___version___/$(VERSION)/.
+	* *-conf.in: Removed arbitrary value for $version and
+	assigned "___version___" instead. #3090 fixed.
+
 	* boot.pl.in (xst_boot_conf_edit_image): Removed append
 	key special case for quoting. Quote values only if they
 	contain spaces and are not already quoted.
diff --git a/Makefile.am b/Makefile.am
index 85ee625..d812288 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,7 @@ EXTRA_DIST = \
 CLEANFILES = $(backends) $(perl_libs)
 
 $(backends): %-conf: %-conf.in
-	sed s#___scriptsdir___#$(scriptsdir)# < $< > $@
+	sed s#___scriptsdir___#$(scriptsdir)#\;s#___version___#$(VERSION)# < $< > $@
 	chmod +x $@
 
 $(perl_libs): %.pl: %.pl.in
diff --git a/boot-conf.in b/boot-conf.in
index 0f60e40..a2b4a14 100644
--- a/boot-conf.in
+++ b/boot-conf.in
@@ -54,7 +54,7 @@ require "___scriptsdir___/boot.pl";
 # --- Tool information --- #
 
 $name = "boot";
-$version = "0.1.0";
+$version = "___version___";
 @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0",
               "redhat-7.1", "mandrake-7.2", "debian-2.2", "debian-woody", 
 	      "suse-7.0", "turbolinux-7.0");
diff --git a/disks-conf.in b/disks-conf.in
index 6883730..0426539 100755
--- a/disks-conf.in
+++ b/disks-conf.in
@@ -46,7 +46,7 @@ require "___scriptsdir___/filesys.pl";
 # --- Tool information --- #
 
 $name = "disks";
-$version = "0.1.0";
+$version = "___version___";
 @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0",
               "redhat-7.1",  "mandrake-7.2", "debian-2.2", "debian-woody", 
 	      "suse-7.0", "turbolinux-7.0");
diff --git a/display-conf.in b/display-conf.in
index d9d0041..e15d708 100644
--- a/display-conf.in
+++ b/display-conf.in
@@ -41,7 +41,7 @@ require "___scriptsdir___/x.pl";
 # --- Tool information --- #
 
 $name = "display";
-$version = "0.1.0";
+$version = "___version___";
 @platforms = qw(redhat-7.0 redhat-7.1 turbolinux-7.0 debian-woody);
 
 $description =<<"end_of_description;";
diff --git a/hardware-conf.in b/hardware-conf.in
index b1dc4a7..78af79e 100755
--- a/hardware-conf.in
+++ b/hardware-conf.in
@@ -59,7 +59,7 @@ require "___scriptsdir___/xml.pl";
 # --- Tool information --- #
 
 $name = "hardware";
-$version = "0.1.0";
+$version = "___version___";
 
 $description =<<"end_of_description;";
        Configures hardware.
diff --git a/internetsharing-conf.in b/internetsharing-conf.in
index 939d974..499408d 100755
--- a/internetsharing-conf.in
+++ b/internetsharing-conf.in
@@ -39,7 +39,7 @@ require "___scriptsdir___/replace.pl";
 # --- Tool information --- #
 
 $name = "internetsharing";
-$version = "0.1.0";
+$version = "___version___";
 @platforms = ("redhat-7.0", "redhat-7.1",
               "mandrake-7.2", "turbolinux-7.0");
 
diff --git a/memory-conf.in b/memory-conf.in
index 6029f5a..109f1cc 100755
--- a/memory-conf.in
+++ b/memory-conf.in
@@ -49,7 +49,7 @@ $DEBUG = 1; # 1 == command; no debug. 2 == no commands, just report. 3 == report
 # --- Tool information --- #
 
 $name = "memory";
-$version = "0.1.0";
+$version = "___version___";
 @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0",
               "redhat-7.1", "mandrake-7.2", "debian-2.2", "debian-woody",
 	      "suse-7.0", "turbolinux-7.0");
diff --git a/mouse-conf.in b/mouse-conf.in
index 7d737a4..f31f2cc 100644
--- a/mouse-conf.in
+++ b/mouse-conf.in
@@ -39,14 +39,14 @@ require "___scriptsdir___/util.pl";
 require "___scriptsdir___/file.pl";	
 require "___scriptsdir___/xml.pl";	
 require "___scriptsdir___/parse.pl";
-require "___scriptsdir___/mouse.pl";
+#require "___scriptsdir___/mouse.pl";
 }
 
 
 # -- Tool information --- #
 
 $name = "mouse";
-$version = "0.1.0";
+$version = "___version___";
 @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", 
 	      "redhat-7.0", "redhat-7.1", "turbolinux-7.0");
 
diff --git a/network-conf.in b/network-conf.in
index bf39314..18f3c32 100755
--- a/network-conf.in
+++ b/network-conf.in
@@ -58,7 +58,7 @@ require "___scriptsdir___/network.pl";
 # --- Tool information --- #
 
 $name = "network";
-$version = "0.1.0";
+$version = "___version___";
 @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", "redhat-7.1",
               "mandrake-7.2",
               "debian-2.2", "debian-woody",
diff --git a/package-conf.in b/package-conf.in
index cc3adc2..0da9ce7 100644
--- a/package-conf.in
+++ b/package-conf.in
@@ -37,7 +37,7 @@ require "___scriptsdir___/xml.pl";
 # --- Tool information --- #
 
 $name = "package";
-$version = "0.0.1";
+$version = "___version___";
 @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0",
               "mandrake-7.2", "suse-7.0", "turbolinux-7.0");
 
@@ -132,7 +132,7 @@ sub get_package
     "redhat"   => "$cmd_map{rpm}",
     "mandrake" => "$cmd_map{rpm}",
     "suse"     => "$cmd_map{rpm}",
-    "debian"   => "$cmd_map{deb}"
+    "debian"   => "$cmd_map{deb}",
     "turbolinux" => "$cmd_map{rpm}",
   );
 
diff --git a/print-conf.in b/print-conf.in
index 10c9d83..89d273f 100755
--- a/print-conf.in
+++ b/print-conf.in
@@ -54,7 +54,7 @@ require "___scriptsdir___/print.pl";
 # --- Tool information --- #
 
 $name = "print";
-$version = "0.1.0";
+$version = "___version___";
 @platforms = ("redhat-7.0", "redhat-7.1", "debian-2.2", "debian-woody", "turbolinux-7.0");
 
 $description =<<"end_of_description;";
diff --git a/shares-conf.in b/shares-conf.in
index 9f73003..ad324b7 100755
--- a/shares-conf.in
+++ b/shares-conf.in
@@ -54,7 +54,7 @@ require "___scriptsdir___/share.pl";
 # --- Tool information --- #
 
 $name = "shares";
-$version = "0.1.0";
+$version = "___version___";
 @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0",
               "redhat-7.1", "mandrake-7.2", "debian-2.2", "debian-woody", "suse-7.0", "turbolinux-7.0");
 
diff --git a/time-conf.in b/time-conf.in
index 98e9708..1a0708c 100755
--- a/time-conf.in
+++ b/time-conf.in
@@ -50,7 +50,7 @@ require "___scriptsdir___/replace.pl";
 # --- Tool information --- #
 
 $name = "time";
-$version = "0.1.0";
+$version = "___version___";
 @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", "redhat-7.1",
               "mandrake-7.2", "debian-2.2", "debian-woody", "suse-7.0", "turbolinux-7.0");
 
diff --git a/users-conf.in b/users-conf.in
index fd9e144..475a16a 100644
--- a/users-conf.in
+++ b/users-conf.in
@@ -60,7 +60,7 @@ $TEST_NIS = 0;
 # --- Tool information --- #
 
 $name = "users";
-$version = "0.1.0";
+$version = "___version___";
 @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0",
               "redhat-7.1", "mandrake-7.2", "debian-2.2", "debian-woody", "suse-7.0", "turbolinux-7.0");