[Pkg-voip-commits] r7815 - in /mumble/trunk/debian: backports/jaunty changelog control mumble.install rules source/format

slicer-guest at alioth.debian.org slicer-guest at alioth.debian.org
Tue Nov 17 18:37:12 UTC 2009


Author: slicer-guest
Date: Tue Nov 17 18:37:12 2009
New Revision: 7815

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7815
Log:
Jaunty doesn't have updated quilt

Modified:
    mumble/trunk/debian/backports/jaunty
    mumble/trunk/debian/changelog
    mumble/trunk/debian/control
    mumble/trunk/debian/mumble.install
    mumble/trunk/debian/rules
    mumble/trunk/debian/source/format

Modified: mumble/trunk/debian/backports/jaunty
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/backports/jaunty?rev=7815&op=diff
==============================================================================
--- mumble/trunk/debian/backports/jaunty (original)
+++ mumble/trunk/debian/backports/jaunty Tue Nov 17 18:37:12 2009
@@ -33,6 +33,7 @@
 $file .= "\n";
 
 $file =~ s/(\nBuild-Depends: [^\n]+)exim4/\1postfix/g;
+$file =~ s/(\nBuild-Depends: [^\n]+)quilt[^\)]+\)/\1/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;

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=7815&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Tue Nov 17 18:37:12 2009
@@ -1,3 +1,9 @@
+mumble (1.2.0~beta1-2~ppa) karmic; urgency=low
+
+  * Karmic
+
+ -- Thorvald Natvig <slicer at users.sourceforge.net>  Tue, 17 Nov 2009 19:35:51 +0100
+
 mumble (1.2.0~beta1-2) UNRELEASED; urgency=low
 
   [ Thorvald Natvig ]

Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=7815&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Tue Nov 17 18:37:12 2009
@@ -4,19 +4,7 @@
 Homepage: http://mumble.sourceforge.net/
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Patrick Matthäi <pmatthaei at debian.org>, Thorvald Natvig <slicer at users.sourceforge.net>
-Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7~), po-debconf,
- libboost-dev (>= 1.36.0), libboost-python-dev (>= 1.36.0),
- libqt4-dev (>= 4.5.0), libqt4-opengl-dev (>= 4.5.0),
- libasound2-dev, libpulse-dev,
- libogg-dev, libspeex-dev, libspeexdsp-dev, libcelt-dev (>= 0.7.0), libsndfile1-dev,
- libssl-dev,
- libzeroc-ice33-dev | libzeroc-ice32-dev | libzeroc-ice-dev,
- ice33-translators | ice32-translators | ice-translators,
- libg15daemon-client-dev,
- libspeechd-dev,
- protobuf-compiler, libprotobuf-dev, libavahi-compat-libdnssd-dev, libxi-dev,
- libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64],
- libc6-dev-i386 [amd64], gcc-multilib [amd64]
+Build-Depends: debhelper (>= 7.0.8), , po-debconf, libboost1.37-dev, libboost-python1.37-dev, libqt4-dev (>= 4.5.0), libqt4-opengl-dev (>= 4.5.0), libasound2-dev, libpulse-dev, libogg-dev, libspeex-dev, libspeexdsp-dev, , libsndfile1-dev, libssl-dev, libzeroc-ice33-dev | libzeroc-ice32-dev | libzeroc-ice-dev, ice33-translators | ice32-translators | ice-translators, libg15daemon-client-dev, libspeechd-dev, protobuf-compiler, libprotobuf-dev, libavahi-compat-libdnssd-dev, libxi-dev, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64], libc6-dev-i386 [amd64], gcc-multilib [amd64]
 Standards-Version: 3.8.3
 DM-Upload-Allowed: yes
 Vcs-Svn: svn://svn.debian.org/pkg-voip/mumble/trunk/
@@ -83,12 +71,7 @@
 
 Package: mumble-server-web
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, mumble-server (>= ${binary:Version}),
- apache2, exim4 | mail-transport-agent,
- libnet-dbus-perl, libcgi-session-perl, libhtml-template-perl,
- php-zeroc-ice,
- ice33-translators | ice32-translators | ice-translators,
- ice33-slice | ice32-slice | ice-slice
+Depends: ${misc:Depends}, ${perl:Depends}, mumble-server (>= ${binary:Version}), apache2, postfix | mail-transport-agent, libnet-dbus-perl, libcgi-session-perl, libhtml-template-perl, php-zeroc-ice, ice33-translators | ice32-translators | ice-translators, ice33-slice | ice32-slice | ice-slice
 Description: Web scripts for mumble-server
  Murmur (in the package mumble-server) is the VoIP server component for
  Mumble. This package contains web scripts for registering users, uploading

Modified: mumble/trunk/debian/mumble.install
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble.install?rev=7815&op=diff
==============================================================================
--- mumble/trunk/debian/mumble.install (original)
+++ mumble/trunk/debian/mumble.install Tue Nov 17 18:37:12 2009
@@ -1,6 +1,6 @@
 release/mumble usr/bin/
 release/libmumble.so* usr/lib/mumble/
-#release/libcelt.so.?.?.? usr/lib/mumble/
+release/libcelt.so.?.?.? usr/lib/mumble/
 release/plugins/liblink.so usr/lib/mumble/
 icons/mumble.xpm usr/share/pixmaps/
 icons/mumble.svg usr/share/icons/hicolor/scalable/apps/

Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=7815&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Tue Nov 17 18:37:12 2009
@@ -14,7 +14,7 @@
 configure-stamp:
 	echo $(DEB_BUILD_ARCH)
 	dh_testdir
-	#dh_quilt_patch
+	dh_quilt_patch
 	qmake-qt4 -recursive main.pro \
 	CONFIG*=release \
 	CONFIG*=symbols \
@@ -55,7 +55,7 @@
 	[ ! -d release-32 ] || rm -rf release-32
 	rm -f $(CURDIR)/debian/mumble-server.logrotate $(CURDIR)/mumble-server.init
 	debconf-updatepo
-	#dh_quilt_unpatch
+	dh_quilt_unpatch
 	dh_clean
 
 install: install-indep install-arch

Modified: mumble/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/source/format?rev=7815&op=diff
==============================================================================
--- mumble/trunk/debian/source/format (original)
+++ mumble/trunk/debian/source/format Tue Nov 17 18:37:12 2009
@@ -1,1 +1,1 @@
-3.0 (quilt)
+1.0




More information about the Pkg-voip-commits mailing list