Made the hvirt-devconfig package into a single hvirt-config package

svn path=/trunk/packages/hvirt-config/; revision=2888

diff --git a/common/etc/apt/sources.list.d/backports.list b/common/etc/apt/sources.list.d/backports.list
new file mode 100644 (file)
index 0000000..9c08625
--- /dev/null
+++ b/common/etc/apt/sources.list.d/backports.list
@@ -0,0 +1,2 @@
+deb http://archive.ubuntu.com/ubuntu hardy-backports main universe multiverse restricted
+deb-src http://archive.ubuntu.com/ubuntu hardy-backports main universe multiverse restricted

diff --git a/common/etc/apt/sources.list.d/hvirt.list b/common/etc/apt/sources.list.d/hvirt.list
new file mode 100644 (file)
index 0000000..655c49c
--- /dev/null
+++ b/common/etc/apt/sources.list.d/hvirt.list
@@ -0,0 +1,3 @@
+## Should be in sources.list.d dir
+deb     http://hvirt-dev.hcs.harvard.edu/apt hardy hvirt
+deb-src http://hvirt-dev.hcs.harvard.edu/apt hardy hvirt

diff --git a/debian/changelog b/debian/changelog
index 2102867..fe1da4b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hvirt-config (0.10) unstable; urgency=low
+
+  * Renamed package to hvirt-config
+
+ -- Greg Brockman <gdb@mit.edu>  Sat, 16 Jan 2010 01:58:48 -0500
+

 hvirt-devconfig (0.9) unstable; urgency=low
 
   * Added network info
 hvirt-devconfig (0.9) unstable; urgency=low
 
   * Added network info

diff --git a/debian/control b/debian/control
index 1311380..6314747 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: hvirt-devconfig
+Source: hvirt-config

 Section: servers
 Priority: important
 Maintainer: HCS Hvirt Project <hvirt@hcs.harvard.edu>
 Section: servers
 Priority: important
 Maintainer: HCS Hvirt Project <hvirt@hcs.harvard.edu>

@@ -8,7 +8,15 @@ Standards-Version: 3.7.2
 Package: hvirt-devconfig
 Architecture: all
 Provides: invirt-config
 Package: hvirt-devconfig
 Architecture: all
 Provides: invirt-config

-Conflicts: invirt-config
+Conflicts: invirt-config, hvirt-prodconfig

 Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-base (>= 0.0.19)
 Description: Hvirt dev-cluster config
   This is the master configuration package for the Hvirt development cluster.
 Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-base (>= 0.0.19)
 Description: Hvirt dev-cluster config
   This is the master configuration package for the Hvirt development cluster.

+
+Package: hvirt-prodconfig
+Architecture: all
+Provides: invirt-config
+Conflicts: invirt-config, hvirt-devconfig
+Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-base (>= 0.0.19)
+Description: Hvirt prod-cluster config
+  This is the master configuration package for the Hvirt production cluster.

diff --git a/debian/copyright b/debian/copyright
index 381dc35..a0b1152 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,7 @@
 This software was written for the XVM project <xvm@mit.edu>
 This software was written for the XVM project <xvm@mit.edu>

-of the MIT Student Information Processing Board.
+of the MIT Student Information Processing Board and adapted
+for the Hvirt project <hvirt@hcs.harvard.edu> of the Harvard
+Computer Society.

 
 Copyright :
 
 
 Copyright :
 

diff --git a/debian/hvirt-devconfig.lintian-overrides b/debian/hvirt-config.lintian-overrides
similarity index 50%
rename from debian/hvirt-devconfig.lintian-overrides
rename to debian/hvirt-config.lintian-overrides
index 0981258..a01441a 100644 (file)
--- a/debian/hvirt-devconfig.lintian-overrides
+++ b/debian/hvirt-config.lintian-overrides
@@ -1 +1,2 @@
 hvirt-devconfig binary: file-in-unusual-dir root/.k5login
 hvirt-devconfig binary: file-in-unusual-dir root/.k5login

+hvirt-prodconfig binary: file-in-unusual-dir root/.k5login
\ No newline at end of file

diff --git a/debian/hvirt-devconfig.install b/debian/hvirt-devconfig.install
index 119068a..390e0d9 100644 (file)
--- a/debian/hvirt-devconfig.install
+++ b/debian/hvirt-devconfig.install
@@ -1 +1,2 @@
-master.yaml etc/invirt
+dev/master.yaml etc/invirt
+common/* .

diff --git a/debian/hvirt-devconfig.postinst b/debian/hvirt-devconfig.postinst
deleted file mode 100755 (executable)
index b9d7c64..0000000
--- a/debian/hvirt-devconfig.postinst
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-# postinst script for hvirt-devconfig
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure)
-       # Regen invirt config
-       if hash invoke-rc.d; then
-            invoke-rc.d invirt-base reload
-        else
-            /etc/init.d/invirt-base reload
-        fi
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    triggered)
-        invirt-reload
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

diff --git a/debian/hvirt-prodconfig.install b/debian/hvirt-prodconfig.install
new file mode 100644 (file)
index 0000000..b7d17a4
--- /dev/null
+++ b/debian/hvirt-prodconfig.install
@@ -0,0 +1 @@
+common/* .

diff --git a/debian/hvirt-prodconfig.triggers b/debian/hvirt-prodconfig.triggers
new file mode 100644 (file)
index 0000000..21273fd
--- /dev/null
+++ b/debian/hvirt-prodconfig.triggers
@@ -0,0 +1 @@
+activate invirt-reload

diff --git a/debian/rules b/debian/rules
index 74f3404..7307394 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,12 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 

-binary-install/xvm-devconfig::
+binary-install/hvirt-devconfig::

        # Versions of CDBS newer than ours do this for us
        # Versions of CDBS newer than ours do this for us

-       dh_lintian -pxvm-devconfig
-       install -m 0644 -D k5login $(DEB_DESTDIR)/root/.k5login
+       dh_lintian -phvirt-devconfig
+       install -m 0644 -D dev/k5login $(DEB_DESTDIR)/root/.k5login
+
+binary-install/hvirt-prodconfig::
+       # Versions of CDBS newer than ours do this for us
+       dh_lintian -phvirt-prodconfig
+       install -m 0644 -D prod/k5login $(DEB_DESTDIR)/root/.k5login

diff --git a/k5login b/dev/k5login
similarity index 100%
rename from k5login
rename to dev/k5login

diff --git a/master.yaml b/dev/master.yaml
similarity index 100%
rename from master.yaml
rename to dev/master.yaml

diff --git a/sysvms/s_console b/dev/sysvms/s_console
similarity index 100%
rename from sysvms/s_console
rename to dev/sysvms/s_console

diff --git a/sysvms/s_master b/dev/sysvms/s_master
similarity index 100%
rename from sysvms/s_master
rename to dev/sysvms/s_master

diff --git a/sysvms/s_remote b/dev/sysvms/s_remote
similarity index 100%
rename from sysvms/s_remote
rename to dev/sysvms/s_remote

diff --git a/prod/k5login b/prod/k5login
new file mode 100644 (file)
index 0000000..30e6458
--- /dev/null
+++ b/prod/k5login
@@ -0,0 +1 @@
+gdb/root@HCS.HARVARD.EDU