From b291702b57e84ff6068b16568f97052a476cd52f Mon Sep 17 00:00:00 2001
From: freesource <freesource>
Date: Sat, 15 Sep 2001 05:07:31 +0000
Subject: [PATCH] Spiffing things up so that packing making is simplified.

---
 add-ons/yard/make-debian-X11/make_debian-X11  |  1 +
 .../yard/make-debian-X11/make_debian-X11_pkg  | 20 +++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/add-ons/yard/make-debian-X11/make_debian-X11 b/add-ons/yard/make-debian-X11/make_debian-X11
index 74c0f5d..8150d12 100755
--- a/add-ons/yard/make-debian-X11/make_debian-X11
+++ b/add-ons/yard/make-debian-X11/make_debian-X11
@@ -34,6 +34,7 @@ my $status = "/var/lib/dpkg/status";
 my $info = "/var/lib/dpkg/info";
 my (%alternatives, @alternatives); # for checking for alternatives
 my %inetd; # checks for inetd binaries.
+my $version  = "1.0";
 
 # You need file-rc, and you may add other extra stuff.  These packages were
 # chosen for woody, so you may need something different.  If you add stuff, 
diff --git a/add-ons/yard/make-debian-X11/make_debian-X11_pkg b/add-ons/yard/make-debian-X11/make_debian-X11_pkg
index 63645de..0c196e8 100755
--- a/add-ons/yard/make-debian-X11/make_debian-X11_pkg
+++ b/add-ons/yard/make-debian-X11/make_debian-X11_pkg
@@ -8,7 +8,8 @@ use File::Find;
 # needs to be run as root.  The advantage of this program is that the 
 # archive will always represent the Makefile which is being tested
 # when development isn't being done with perl -I . ./gbootroot.
-# This program can be adapted for other packages.
+# This program can be adapted for other packages, as long as $version is
+# included in the program.
 
 # This program uses dh-make, and copies your own defaults to 
 # $packaging_place/debian from your $packaging_defaults, and updates
@@ -22,18 +23,21 @@ use File::Find;
 # Makefile.pkg in $gbootroot_cvs in used as the packages Makefile.
 
 my $user_home = "/home/mttrader";
-my $prog = "gbootroot";
+my $prog = "make-debian-X11";
+my $prog_real_name = "make_debian-X11";
 my $revision = 1;
 my $dist = "unstable";
 my $urgency = "low";
 #my $arch = "all";
 #my $group = "utils";
 #my $priority = "optional";
-my $gbootroot_cvs =  "$user_home/gbootroot/gbootroot";
-my $packaging_place = "$user_home/gbootroot/PACKAGING";
-my $packaging_defaults = "$gbootroot_cvs/pkg/dpkg";
+my $gbootroot_cvs =  
+    "$user_home/gbootroot/gbootroot/add-ons/yard/make-debian-X11";
+my $packaging_place = "$user_home/gbootroot/PACKAGING-debian-X11";
+my $packaging_defaults = "$gbootroot_cvs/add-ons/yard/make-debian-X11/pkg";
 my $email = "freesource\@users.sourceforge.net";
 my $name = "Jonathan Rosenbaum";
+my $makefile = "Makefile";
 
 # Other vars
 my ($real_uid, $real_gid) = (stat($user_home))[4,5];
@@ -41,8 +45,8 @@ my ($real_uid, $real_gid) = (stat($user_home))[4,5];
 # Find the version
 
 my $version;
-open(CVS, "$gbootroot_cvs/$prog") or 
-	die "Couldn't find $prog in $gbootroot_cvs: $!\n";
+open(CVS, "$gbootroot_cvs/$prog_real_name") or 
+	die "Couldn't find $prog_real_name in $gbootroot_cvs: $!\n";
 	while (<CVS>) {
 		if (/\my \$version/) {
 			$version = (split(/=/,$_))[1];
@@ -103,7 +107,7 @@ foreach (@make_lines) {
         }
 }
 
-system "cp -fa Makefile.pkg $packaging_place/Makefile";
+system "cp -fa $makefile $packaging_place/Makefile";
 
 # Now we get to clean out any CVS directories and make sure that the 
 # permissions are all for the user who will be creating the package.