[Pkg-voip-commits] r7786 - in /mumble/trunk/debian: backports/jaunty backports/karmic changelog

[slicer-guest at alioth.debian.org]

Author: slicer-guest
Date: Wed Nov 11 22:15:00 2009
New Revision: 7786

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7786
Log:
New upstream beta release.

Added:
    mumble/trunk/debian/backports/karmic   (with props)
Modified:
    mumble/trunk/debian/backports/jaunty
    mumble/trunk/debian/changelog

Modified: mumble/trunk/debian/backports/jaunty
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/backports/jaunty?rev=7786&op=diff
==============================================================================
--- mumble/trunk/debian/backports/jaunty (original)
+++ mumble/trunk/debian/backports/jaunty Wed Nov 11 22:15:00 2009
@@ -1,12 +1,57 @@
-#! /bin/bash
+#! /usr/bin/perl
 #
 # Hook for automatic backports.
 #
-# Target dist: Ubuntu Janty Jackalope
+# Target dist: Ubuntu Jaunty
 
-sed -i -e 's#^\(Depends:.*\)exim4\(.*\)$#\1postfix\2#' debian/control
+use warnings;
+use strict;
+use Carp;
 
-perl -pi -e 'if (/^(Build-Depends:\s*)(.+)([\r\n]*)$/) { $_ = $1 . join(", ", grep(! /^libcelt/,split(/,\s*/,$2))) . $3}' debian/control
-sed -i -e 's#^\(Build-Depends:.*\)libboost-dev ([^)]*)\(.*\)$#\1libboost1.37-dev\2#' debian/control
-sed -i -e 's#^\(Build-Depends:.*\)libboost-python-dev ([^)]*)\(.*\)$#\1libboost-python1.37-dev\2#' debian/control
-sed -i -e 's#CONFIG.=no-bundled-celt ##' debian/rules
+open(F, "debian/control") or croak;
+my $first = 1;
+my $file;
+my $field = '';
+while(<F>) {
+  chomp();
+  if (/^(\S+):/) {
+    $field = $1;
+  }
+  if ($first) {
+    $file .= $_;
+    $first = 0;
+  } elsif (/^$/) {
+    $file .= "\n";
+  } elsif ($field eq 'Description' || /^[^ ]/ || /^$/) {
+    $file .= "\n" . $_;
+  } else {
+    $file .= $_;
+  }
+}
+close(F);
+
+$file .= "\n";
+
+$file =~ s/(\nBuild-Depends: [^\n]+)exim4/\1postfix/g;
+$file =~ s/(\nBuild-Depends: [^\n]+)libcelt-dev[^\)]+\)/\1/g;
+$file =~ s/(\nBuild-Depends: [^\n]+)libboost-dev[^\)]+\)/\1libboost1.37-dev/g;
+$file =~ s/(\nBuild-Depends: [^\n]+)libboost-python-dev[^\)]+\)/\1libboost-python1.37-dev/g;
+$file =~ s/(\nDepends: [^\n]+)exim4/\1postfix/g;
+
+open(F, ">debian/control") or croak;
+print F $file;
+close(F);
+
+$file = '';
+open(F, "debian/rules") or croak;
+while (<F>) {
+  $file .= $_;
+}
+close(F);
+
+#$file =~ s/dh_testdir//g;
+
+open(F, ">debian/rules") or croak;
+print F $file;
+close(F);
+

Added: mumble/trunk/debian/backports/karmic
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/backports/karmic?rev=7786&op=file
==============================================================================
--- mumble/trunk/debian/backports/karmic (added)
+++ mumble/trunk/debian/backports/karmic Wed Nov 11 22:15:00 2009
@@ -1,0 +1,54 @@
+#! /usr/bin/perl
+#
+# Hook for automatic backports.
+#
+# Target dist: Ubuntu Karmic
+
+use warnings;
+use strict;
+use Carp;
+
+open(F, "debian/control") or croak;
+my $first = 1;
+my $file;
+my $field = '';
+while(<F>) {
+  chomp();
+  if (/^(\S+):/) {
+    $field = $1;
+  }
+  if ($first) {
+    $file .= $_;
+    $first = 0;
+  } elsif (/^$/) {
+    $file .= "\n";
+  } elsif ($field eq 'Description' || /^[^ ]/ || /^$/) {
+    $file .= "\n" . $_;
+  } else {
+    $file .= $_;
+  }
+}
+close(F);
+
+$file .= "\n";
+
+$file =~ s/(\nBuild-Depends: [^\n]+)exim4/\1postfix/g;
+$file =~ s/(\nBuild-Depends: [^\n]+)libcelt-dev[^\)]+\)/\1/g;
+$file =~ s/(\nDepends:. [^\n]+)exim4/\1postfix/g;
+
+
+open(F, ">debian/control") or croak;
+print F $file;
+close(F);
+
+$file = '';
+open(F, "debian/rules") or croak;
+while (<F>) {
+  $file .= $_;
+}
+close(F);
+
+open(F, ">debian/rules") or croak;
+print F $file;
+close(F);
+

Propchange: mumble/trunk/debian/backports/karmic
------------------------------------------------------------------------------
    svn:executable = *

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=7786&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Wed Nov 11 22:15:00 2009
@@ -8,12 +8,12 @@
   * Extend the long description of the mumble-11x package. Thanks lintian.
 
   [ Thorvald Natvig ]
-  * New upstream release.
+  * New upstream beta release.
   * Update get-orig-source.
   * Update dependencies.
   * Let the qmake script find the celt/speex libraries on its own.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 11 Nov 2009 19:08:17 +0100
+ -- Thorvald Natvig <slicer at users.sourceforge.net>  Wed, 11 Nov 2009 23:14:18 +0100
 
 mumble (1.2.0~200910141302-8af721-1) experimental; urgency=low