add wheezy support (patch from e100 + minor fixes)

diff --git a/DAB.pm b/DAB.pm
index 4afa7e660f9327074b31781753dd242435ce5894..a33d875dd3f87a78dc6169ab71b345c74e27edcd 100644 (file)
--- a/DAB.pm
+++ b/DAB.pm
@@ -377,7 +377,9 @@ sub new {
        if $arch !~ m/^(i386|amd64)$/;
 
     my $suite = $config->{suite} || die "no 'suite' specified\n";
-    if ($suite eq 'squeeze') {
+    if ($suite eq 'wheezy') {
+         $config->{ostype} = "debian-7.0";
+    } elsif ($suite eq 'squeeze') {
        $config->{ostype} = "debian-6.0";
     } elsif ($suite eq 'lenny') { 
        $config->{ostype} = "debian-5.0";
@@ -412,10 +414,10 @@ sub new {
     }
 
     if (!$config->{source}) {
-       if ($suite eq 'etch' || $suite eq 'lenny' || $suite eq 'squeeze') {
+       if ($suite eq 'etch' || $suite eq 'lenny' || $suite eq 'squeeze' || $suite eq 'wheezy' ) {
            push @{$config->{source}}, "http://ftp.debian.org/debian SUITE main contrib";
            push @{$config->{source}}, "http://ftp.debian.org/debian SUITE-updates main contrib"
-               if ($suite eq 'squeeze');
+               if ($suite eq 'squeeze' || $suite eq 'wheezy');
            push @{$config->{source}}, "http://security.debian.org SUITE/updates main contrib";
        } elsif ($suite eq 'hardy' || $suite eq 'intrepid' || $suite eq 'jaunty') {
            my $comp = "main restricted universe multiverse";
@@ -1500,7 +1502,7 @@ sub ve_mysql_bootstrap {
 
     my $suite = $self->{config}->{suite};
  
-    if ($suite eq 'squeeze') {
+    if ($suite eq 'squeeze' || $suite eq 'wheezy' ) {
        $cmd = "/usr/sbin/mysqld --bootstrap --user=mysql --skip-grant-tables";
 
     } else {
@@ -1537,6 +1539,9 @@ sub task_postgres {
     } elsif ($suite eq 'squeeze') {
        @supp = ('8.4');
        $pgversion = '8.4';
+    } elsif ($suite eq 'wheezy') {
+        @supp = ('9.1');
+        $pgversion = '9.1';
     }
 
     $pgversion = $opts->{version} if $opts->{version};
@@ -1552,7 +1557,10 @@ sub task_postgres {
  
     $self->ve_dpkg ('install', @$required);
 
-    my $iscript = $suite eq 'squeeze' ? 'postgresql' : "postgresql-$pgversion";
+    my $iscript = "postgresql-$pgversion";
+    if ($suite eq 'squeeze' || $suite eq 'wheezy') {
+      $iscript = 'postgresql';
+    }
 
     $self->ve_command ("/etc/init.d/$iscript start") if $opts->{start};
 }
@@ -1565,7 +1573,12 @@ sub task_mysql {
 
     my $suite = $self->{config}->{suite};
     
-    my $ver = $suite eq 'squeeze' ? '5.1' : '5.0';
+    my $ver = '5.0';
+    if ($suite eq 'squeeze') {
+      $ver = '5.1';
+    } elsif ($suite eq 'wheezy') {
+      $ver = '5.5';
+    }
 
     my $required = $self->compute_required (['mysql-common', "mysql-server-$ver"]);
 

diff --git a/Makefile b/Makefile
index 36b986281b3e3c15555e248e27766d7e891e10a9..fe8ce9b9786f49755d8dbebe94d04d1368416400 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=2.0
+RELEASE=2.1
 
 VERSION=1.2
 PACKAGE=dab
-PKGREL=1
+PKGREL=2
 
 
 SCRIPTS=                                       \

diff --git a/changelog.Debian b/changelog.Debian
index 5c62325ccc1ac36177a2457a7179ba708efec0d6..b43cfc08752b01e6beaefd67b6a5a84c181cc54b 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+dab (1.2-2) unstable; urgency=low
+
+  * add wheezy support
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 13 Jul 2012 06:44:36 +0200
+
 dab (1.2-1) unstable; urgency=low
 
   * first release for debian squeeze