From 42f3cd11a5448c1bbe1f02741c7c240a3db5e483 Mon Sep 17 00:00:00 2001
From: freesource <freesource>
Date: Mon, 15 Oct 2001 05:08:47 +0000
Subject: [PATCH] More stuff to make a nice dswim package.

---
 Makefile       | 6 ++++--
 Makefile.pkg   | 6 ++++--
 SWIM/Search.pm | 8 ++++----
 swim_pkg       | 2 +-
 swimrc         | 2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index a3aef31..82a168c 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ install:
 	cp -fa SWIM/*pm /usr/share/perl5/SWIM
 	install -d /usr/lib/dswim 
 	cp -fa bin/*swim /usr/lib/dswim
-	install -d /etc/swim
-	cp -fa swimrc /etc/swim
+	install -d /etc/dswim
+	cp -fa swimrc /etc/dswim
 	install -d /usr/share/man/man8
 	cp -fa swim.8 /usr/share/man/man8
 	install -d /usr/share/man/man5
@@ -23,6 +23,8 @@ remove:
 	rm /usr/bin/swim
 	rm /usr/lib/dswim/*swim
 	rmdir /usr/lib/dswim
+	rm /etc/dswim/swimrc
+	rmdir /etc/dswim
 	rm /usr/share/man/man8/swim.8
 	rm /usr/share/man/man5/swimrc.5
 
diff --git a/Makefile.pkg b/Makefile.pkg
index f658500..c54fd70 100644
--- a/Makefile.pkg
+++ b/Makefile.pkg
@@ -9,8 +9,8 @@ install:
 	cp -fa SWIM/*pm $(DESTDIR)/usr/share/perl5/SWIM
 	install -d $(DESTDIR)/usr/lib/dswim 
 	cp -fa bin/*swim $(DESTDIR)/usr/lib/dswim
-	install -d $(DESTDIR)/etc/swim
-	cp -fa swimrc $(DESTDIR)/etc/swim
+	install -d $(DESTDIR)/etc/dswim
+	cp -fa swimrc $(DESTDIR)/etc/dswim
 	install -d $(DESTDIR)/usr/share/man/man8
 	cp -fa swim.8 $(DESTDIR)/usr/share/man/man8
 	install -d $(DESTDIR)/usr/share/man/man5
@@ -22,6 +22,8 @@ remove:
 	rm /usr/bin/swim
 	rm /usr/lib/dswim/*swim
 	rmdir /usr/lib/dswim
+	rm /etc/dswim/swimrc
+	rmdir /etc/dswim
 	rm /usr/share/man/man8/swim.8
 	rm /usr/share/man/man5/swimrc.5
 
diff --git a/SWIM/Search.pm b/SWIM/Search.pm
index 1787baa..f611b99 100644
--- a/SWIM/Search.pm
+++ b/SWIM/Search.pm
@@ -214,7 +214,7 @@ sub search {
             } 
            }
           }
-    print "swim: found $count package(s)\n"; 
+    print STDERR "swim: found $count package(s)\n"; 
 
     }
     if (!$line) {
@@ -300,7 +300,7 @@ sub search {
             }
            }
     }
-    print "swim: found $count package(s)\n"; 
+    print STDERR "swim: found $count package(s)\n"; 
     if (!$line) {
       $line = "";
     }
@@ -390,7 +390,7 @@ sub search {
             }
            }
           }
-    print "swim: found $count package(s)\n"; 
+    print STDERR "swim: found $count package(s)\n"; 
     if (!$line) {
       $line = "";
     }
@@ -709,7 +709,7 @@ sub search {
              }
            }
           }
-    print "swim: found $count package(s)\n"; 
+    print STDERR "swim: found $count package(s)\n"; 
     if (!$line) {
       $line = "";
     }
diff --git a/swim_pkg b/swim_pkg
index a28d4ee..179427b 100755
--- a/swim_pkg
+++ b/swim_pkg
@@ -43,7 +43,7 @@ use File::Find;
 # Makefile.pkg in $gbootroot_cvs in used as the packages Makefile.
 
 my $user_home = "/home/mttrader";
-my $prog = "swim";
+my $prog = "dswim";
 my $prog_real_name = "swim";
 my $revision = 1;
 my $dist = "unstable";
diff --git a/swimrc b/swimrc
index ecf60a2..232ad10 100644
--- a/swimrc
+++ b/swimrc
@@ -13,7 +13,7 @@ $apt = "yes";
 # No automatic rebuilding of databases.
 # Databases will automatically by rebuilt if any differences are found
 # in the status.  Although --db could be used to update the changes
-# for each particular packages, newer versions of DB_File have introduced
+# for each particular packages, newer versions of libdb2 have introduced
 # bugs;  --rebuilddb is know to be 100% stable.  On some systems
 # which are slow, or have massive installations this feature may be
 # annoying.  If you decide to turn it off, remember to --rebuilddb your