update references to pg 8.3 -> 8.4

diff --git a/debian/changelog b/debian/changelog
index 968bbb0..9eed6db 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-database (0.2.8~glasgall3) precise; urgency=low
+
+  * Also update references to postgres 8.3 to 8.4 in scripts
+
+ -- Adam Glasgall <glasgall@mit.edu>  Thu, 21 Mar 2013 21:23:06 -0700
+

 invirt-database (0.2.8~glasgall2) precise; urgency=low
 
   * Bump postgres version in Depends:
 invirt-database (0.2.8~glasgall2) precise; urgency=low
 
   * Bump postgres version in Depends:

diff --git a/debian/invirt-database-server.init b/debian/invirt-database-server.init
index f3074ca..62d1a82 100644 (file)
--- a/debian/invirt-database-server.init
+++ b/debian/invirt-database-server.init
@@ -10,8 +10,8 @@
 ### END INIT INFO
 
 PACKAGE=invirt-database-server
 ### END INIT INFO
 
 PACKAGE=invirt-database-server

-PARENTPACKAGE=postgresql-8.3
-GEN_FILES=/etc/postgresql/8.3/main/pg_hba.conf
+PARENTPACKAGE=postgresql-8.4
+GEN_FILES=/etc/postgresql/8.4/main/pg_hba.conf

 
 dpkg -s "$PACKAGE" >/dev/null 2>/dev/null || exit 0
 
 
 dpkg -s "$PACKAGE" >/dev/null 2>/dev/null || exit 0
 

diff --git a/debian/invirt-database-server.install b/debian/invirt-database-server.install
index a8795e6..20459f2 100644 (file)
--- a/debian/invirt-database-server.install
+++ b/debian/invirt-database-server.install
@@ -1,4 +1,4 @@
-postgresql-8.3.invirt etc/init.d
-debian/postgresql.conf.invirt etc/postgresql/8.3/main
-pg_hba.conf.mako etc/postgresql/8.3/main
+postgresql-8.4.invirt etc/init.d
+debian/postgresql.conf.invirt etc/postgresql/8.4/main
+pg_hba.conf.mako etc/postgresql/8.4/main

 invirt-database-tables usr/bin
 invirt-database-tables usr/bin

diff --git a/debian/invirt-database-server.postinst b/debian/invirt-database-server.postinst
index f5cd5a9..903e64e 100644 (file)
--- a/debian/invirt-database-server.postinst
+++ b/debian/invirt-database-server.postinst
@@ -39,7 +39,7 @@ case "$1" in
        if ! getent passwd invirt >/dev/null 2>&1; then
            adduser --system invirt
        fi
        if ! getent passwd invirt >/dev/null 2>&1; then
            adduser --system invirt
        fi

-       invoke-rc.d postgresql-8.3 restart
+       invoke-rc.d postgresql-8.4 restart

         su invirt -s /bin/sh -c 'invirt-database-tables create'
     ;;
 
         su invirt -s /bin/sh -c 'invirt-database-tables create'
     ;;
 

diff --git a/debian/rules b/debian/rules
index e4d04b3..cda620a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,8 @@ DEB_PYTHON2_MODULE_PACKAGES = invirt-database
 DEB_DIVERT_EXTENSION = .invirt
 
 DEB_DIVERT_FILES_invirt-database-server += \
 DEB_DIVERT_EXTENSION = .invirt
 
 DEB_DIVERT_FILES_invirt-database-server += \

-       /etc/postgresql/8.3/main/postgresql.conf.invirt \
-       /etc/init.d/postgresql-8.3.invirt
+       /etc/postgresql/8.4/main/postgresql.conf.invirt \
+       /etc/init.d/postgresql-8.4.invirt

 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk

@@ -20,12 +20,12 @@ debian/postgresql.conf.invirt: debian/transform_postgresql.conf.invirt
        chmod a+rwx "$$invirt_tmp"; \
        PG_CLUSTER_CONF_ROOT="$$invirt_tmp/etc/postgresql" \
            LC_ALL=en_US.UTF-8 \
        chmod a+rwx "$$invirt_tmp"; \
        PG_CLUSTER_CONF_ROOT="$$invirt_tmp/etc/postgresql" \
            LC_ALL=en_US.UTF-8 \

-           pg_createcluster 8.3 main \
-           --datadir="$$invirt_tmp/var/lib/postgresql/8.3/main" \
+           pg_createcluster 8.4 main \
+           --datadir="$$invirt_tmp/var/lib/postgresql/8.4/main" \

            --socketdir=/var/run/postgresql \
            --port=5432; \
        chmod +x $<; \
            --socketdir=/var/run/postgresql \
            --port=5432; \
        chmod +x $<; \

-       $< < "$$invirt_tmp/etc/postgresql/8.3/main/postgresql.conf" > $@; \
+       $< < "$$invirt_tmp/etc/postgresql/8.4/main/postgresql.conf" > $@; \

        rm -rf "$$invirt_tmp"
 
 clean::
        rm -rf "$$invirt_tmp"
 
 clean::

diff --git a/postgresql-8.3.invirt b/postgresql-8.4.invirt
similarity index 69%
rename from postgresql-8.3.invirt
rename to postgresql-8.4.invirt
index 1e8ca4d..0d4409a 100755 (executable)
--- a/postgresql-8.3.invirt
+++ b/postgresql-8.4.invirt
@@ -1,14 +1,14 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 #! /bin/sh
 ### BEGIN INIT INFO

-# Provides:          postgresql postgresql-8.3
+# Provides:          postgresql postgresql-8.4

 # Required-Start:    $local_fs $remote_fs $network $time
 # Required-Stop:     $local_fs $remote_fs $network $time
 # Should-Start:      $syslog
 # Should-Stop:       $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Required-Start:    $local_fs $remote_fs $network $time
 # Required-Stop:     $local_fs $remote_fs $network $time
 # Should-Start:      $syslog
 # Should-Stop:       $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6

-# Short-Description: PostgreSQL 8.3 RDBMS server
-# Description:       This script proxies requests to the default postgresql-8.3,
+# Short-Description: PostgreSQL 8.4 RDBMS server
+# Description:       This script proxies requests to the default postgresql-8.4,

 #                    except for restart, which it translates to a stop request,
 #                    and then a start request, so that PostgreSQL is shut down
 #                    with a fast shutdown
 #                    except for restart, which it translates to a stop request,
 #                    and then a start request, so that PostgreSQL is shut down
 #                    with a fast shutdown

@@ -16,12 +16,12 @@
 
 case "$1" in
   restart)
 
 case "$1" in
   restart)

-        invoke-rc.d postgresql-8.3.invirt-orig stop
-        invoke-rc.d postgresql-8.3.invirt-orig start
+        invoke-rc.d postgresql-8.4.invirt-orig stop
+        invoke-rc.d postgresql-8.4.invirt-orig start

         exit $?
        ;;
   *)
         exit $?
        ;;
   *)

-        invoke-rc.d postgresql-8.3.invirt-orig "$1"
+        invoke-rc.d postgresql-8.4.invirt-orig "$1"

         exit $?
        ;;
 esac
         exit $?
        ;;
 esac