last step of repo switches

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1716 ce84e21b-d406-0410-9b95-82705330c041

5 files changed, 39 insertions, 22 deletions

diff --git a/debian/bcfg2-server.init b/debian/bcfg2-server.init
index 1baf44f08..e052a854f 100644
--- a/debian/bcfg2-server.init
+++ b/debian/bcfg2-server.init
@@ -6,28 +6,28 @@
 # description: bcfg2 server for configuration requests
 # 
 
-PIDFILE=/var/tmp/bcfg2-xmlrpc.pid
+PIDFILE=/var/tmp/bcfg2-server.pid
 
 case "$1" in
   start)
-    echo -n "Starting Bcfg2Server: "
+    echo -n "Starting bcfg2-server: "
     if [ -f "/etc/SuSE-release" ] ; then
-        /sbin/start_daemon -p "${PIDFILE}" /usr/sbin/Bcfg2Server
+        /sbin/start_daemon -p "${PIDFILE}" /usr/sbin/bcfg2-server
     elif [ -f "/etc/redhat-release" ]; then
-       /usr/sbin/Bcfg2Server -D "${PIDFILE}"
+       /usr/sbin/bcfg2-server -D "${PIDFILE}"
     else
-       /sbin/start-stop-daemon --pidfile "${PIDFILE}" --make-pidfile -b -S --startas /usr/sbin/Bcfg2Server
+       /sbin/start-stop-daemon --pidfile "${PIDFILE}" --make-pidfile -b -S --startas /usr/sbin/bcfg2-server
     fi
-    echo "Bcfg2Server"
+    echo "bcfg2-server"
     ;;
   stop)
-    echo -n "Stopping Bcfg2Server: "
+    echo -n "Stopping bcfg2-server: "
     if [ -f "/etc/SuSE-release" ] ; then
-        /sbin/killproc -p "${PIDFILE}" /usr/sbin/Bcfg2Server
+        /sbin/killproc -p "${PIDFILE}" /usr/sbin/bcfg2-server
     elif [ -f "/etc/redhat-release" ]; then
        kill -INT `cat ${PIDFILE}`
     else
-       /sbin/start-stop-daemon -p "${PIDFILE}" -K /usr/sbin/Bcfg2Server
+       /sbin/start-stop-daemon -p "${PIDFILE}" -K /usr/sbin/bcfg2-server
     fi
     echo done
     ;;
diff --git a/debian/bcfg2-server.install b/debian/bcfg2-server.install
index d1ab3e9ac..442ecedf5 100644
--- a/debian/bcfg2-server.install
+++ b/debian/bcfg2-server.install
@@ -1,7 +1,6 @@
-debian/bcfg2-install/usr/bin/Bcfg2Server* usr/sbin
-debian/bcfg2-install/usr/bin/ValidateBcfg2Repo usr/sbin
+debian/bcfg2-install/usr/bin/bcfg2-* usr/sbin
 debian/bcfg2-install/usr/bin/StatReports usr/sbin
 debian/bcfg2-install/usr/bin/GenerateHostInfo usr/sbin
 debian/bcfg2-install/usr/lib/python2.3/site-packages/Bcfg2/Server/* usr/lib/python2.3/site-packages/Bcfg2/Server
 debian/bcfg2-install/usr/share/bcfg2/* usr/share/bcfg2/
-debian/bcfg2-install/usr/share/man/man8/* usr/share/man/man8
\ No newline at end of file
+debian/bcfg2-install/usr/share/man/man8/* usr/share/man/man8
diff --git a/debian/changelog b/debian/changelog
index c331caf28..e7f23ba42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,39 @@
-bcfg2 (0.7.4-1) unstable; urgency=low
+bcfg2 (0.8.0-1) unstable; urgency=low
 
-  * final release
+  * New upstream release
 
- -- Narayan Desai <desai@mcs.anl.gov>  Mon, 16 Jan 2006 10:52:13 -0600
+ -- Narayan Desai <desai@mcs.anl.gov>  Fri, 20 Jan 2006 15:53:30 -0600
 
-bcfg2 (0.7.4pre5-1) unstable; urgency=low
+bcfg2 (0.8.0pre5-1) unstable; urgency=low
 
-  * new upstream
+  * New upstream release
+
+ -- Narayan Desai <desai@mcs.anl.gov>  Mon, 16 Jan 2006 12:11:09 -0600
+
+bcfg2 (0.8.0pre4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Narayan Desai <desai@mcs.anl.gov>  Wed, 11 Jan 2006 16:04:53 -0600
+
+bcfg2 (0.8.0pre3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Narayan Desai <desai@mcs.anl.gov>  Tue, 10 Jan 2006 15:05:48 -0600
+
+bcfg2 (0.8.0pre2-1) unstable; urgency=low
+
+  * New upstream release
 
- -- Narayan Desai <desai@mcs.anl.gov>  Tue, 10 Jan 2006 14:56:21 -0600
+ -- Narayan Desai <desai@mcs.anl.gov>  Fri,  6 Jan 2006 14:18:36 -0600
 
-bcfg2 (0.7.4pre4-1) unstable; urgency=low
+bcfg2 (0.8.0pre1-1) unstable; urgency=low
 
   * new upstream
+  * major repository format change
 
- -- Narayan Desai <desai@mcs.anl.gov>  Thu,  5 Jan 2006 10:43:16 -0600
+ -- Narayan Desai <desai@mcs.anl.gov>  Thu,  5 Jan 2006 10:47:04 -0600
 
 bcfg2 (0.7.4pre3-1) unstable; urgency=low
 
diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644
index 8b1378917..000000000
--- a/debian/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/control b/debian/control
index be50aba98..a4774e6d4 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: build configuration system
 
 Package: bcfg2-server
 Architecture: all
-Depends: ${python:Depends}, bcfg2, python-lxml (>= 0.8), python-fam | python2.3-gamin, m2crypto, libxml2-utils
+Depends: ${python:Depends}, bcfg2, python-lxml (>= 0.8), python2.3-fam | python2.3-gamin, m2crypto, libxml2-utils, fam | gamin
 Description: build configuration system, version two
  Bcfg2 is a symbolic configuration management system, 
  produced at Argonne National Lab.