[Pkg-voip-commits] r5333 - in /mumble/trunk/debian: README.Debian mumble-server.README.Debian patches/ patches/00list patches/01-use-external-speex.dpatch po/de.po rules
the-me-guest at alioth.debian.org
the-me-guest at alioth.debian.org
Wed Mar 19 21:46:08 UTC 2008
Author: the-me-guest
Date: Wed Mar 19 21:46:08 2008
New Revision: 5333
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5333
Log:
Included dpatch.
Added experimental 01-use-external-speex.dpatch.
Added debconf-updatepo to the clean rule and dh_makeshlibs, it was lost during the sync with the ubuntu package *hugs*.
Pass defaults 95 to dh_installinit.
Renamed DEBIAN.Readme to mumble-server.DEBIAN.Readme, it's only for the mumble-server package.
Removed useless whitespace at EOL in the readme.
Added german translation for the debconf foo.
Added:
mumble/trunk/debian/mumble-server.README.Debian
mumble/trunk/debian/patches/
mumble/trunk/debian/patches/00list
mumble/trunk/debian/patches/01-use-external-speex.dpatch
mumble/trunk/debian/po/de.po
Removed:
mumble/trunk/debian/README.Debian
Modified:
mumble/trunk/debian/rules
Added: mumble/trunk/debian/mumble-server.README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.README.Debian?rev=5333&op=file
==============================================================================
--- mumble/trunk/debian/mumble-server.README.Debian (added)
+++ mumble/trunk/debian/mumble-server.README.Debian Wed Mar 19 21:46:08 2008
@@ -1,0 +1,15 @@
+This package includes a system-wide installation of murmurd. If you want a
+personal server running on your own user account, use the murmur-wrapper
+script.
+
+If you have apache running, you can install the mumble-server-web package and
+access the user list at
+http://localhost/cgi-bin/mumble-server/list.cgi
+and new users can register themselves at
+http://localhost/cgi-bin/mumble-server/register.cgi
+
+For registration to work, you will need to set an email address to use for
+registraion emails. To set the address, dpkg-reconfigure mumble-server.
+
+Murmur's root user is called SuperUser. To set the password for superuser,
+simply dpkg-reconfigure mumble-server.
Added: mumble/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/00list?rev=5333&op=file
==============================================================================
--- mumble/trunk/debian/patches/00list (added)
+++ mumble/trunk/debian/patches/00list Wed Mar 19 21:46:08 2008
@@ -1,0 +1,1 @@
+01-use-external-speex.dpatch
Added: mumble/trunk/debian/patches/01-use-external-speex.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/01-use-external-speex.dpatch?rev=5333&op=file
==============================================================================
--- mumble/trunk/debian/patches/01-use-external-speex.dpatch (added)
+++ mumble/trunk/debian/patches/01-use-external-speex.dpatch Wed Mar 19 21:46:08 2008
@@ -1,0 +1,40 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 01-use-external-speex.dpatch by Patrick Matthäi <patrick.matthaei at web.de>
+##
+## DP: Compile against the external speex.
+
+ at DPATCH@
+
+diff -Naur mumble-1.1.3.orig/main.pro mumble-1.1.3/main.pro
+--- mumble-1.1.3.orig/main.pro 2008-02-23 19:49:51.000000000 +0100
++++ mumble-1.1.3/main.pro 2008-03-19 21:49:13.000000000 +0100
+@@ -1,7 +1,6 @@
+ TEMPLATE = subdirs
+ CONFIG += debug_and_release
+
+-SUBDIRS += speexbuild
+ SUBDIRS += src/mumble src/murmur
+
+ win32 {
+diff -Naur mumble-1.1.3.orig/src/mumble/mumble.pro mumble-1.1.3/src/mumble/mumble.pro
+--- mumble-1.1.3.orig/src/mumble/mumble.pro 2008-02-23 19:50:00.000000000 +0100
++++ mumble-1.1.3/src/mumble/mumble.pro 2008-03-19 21:49:13.000000000 +0100
+@@ -9,7 +9,6 @@
+ SOURCES += ../ACL.cpp ../Group.cpp ../Channel.cpp ../Message.cpp ../Connection.cpp ../Player.cpp ../Timer.cpp ../CryptState.cpp
+ SOURCES += smallft.cpp
+ DIST += licenses.h smallft.h mumble.ico mumble.xpm plugins/mumble_plugin.h mumble-overlay mumble.desktop mumble.protocol murmur_pch.h
+-INCLUDEPATH += ../../speex/include ../../speex/libspeex ../../speexbuild
+ LIBS += -lspeex
+ RESOURCES += mumble.qrc
+ FORMS += ConfigDialog.ui MainWindow.ui ConnectDialog.ui BanEditor.ui ACLEditor.ui Plugins.ui Overlay.ui LookConfig.ui AudioConfigDialog.ui Log.ui TextMessage.ui AudioStats.ui NetworkConfig.ui
+@@ -61,10 +60,6 @@
+ # QMAKE_CXXFLAGS += -mmmx -msse
+ # }
+
+- QMAKE_CFLAGS += -I../../speex/include -I../../speexbuild
+- QMAKE_CXXFLAGS += -I../../speex/include -I../../speexbuild
+- QMAKE_CXXFLAGS_RELEASE += -I../../speex/include -I../../speexbuild
+- QMAKE_CXXFLAGS_DEBUG += -I../../speex/include -I../../speexbuild
+ CONFIG += link_pkgconfig
+
+ PKGCONFIG += openssl
Added: mumble/trunk/debian/po/de.po
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/po/de.po?rev=5333&op=file
==============================================================================
--- mumble/trunk/debian/po/de.po (added)
+++ mumble/trunk/debian/po/de.po Wed Mar 19 21:46:08 2008
@@ -1,0 +1,87 @@
+# German translation for the mumble-server package.
+# Copyright (C) 2008 by Patrick Matthäi
+# This file is distributed under the same license as the mumble package.
+# Patrick Matthäi <patrick.matthaei at web.de>, 2008.
+#
+
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.1.3\n"
+"Report-Msgid-Bugs-To: patrick.matthaei at web.de\n"
+"POT-Creation-Date: 2008-03-19 22:34+0100\n"
+"PO-Revision-Date: 2008-03-19 22:34+0100\n"
+"Last-Translator: Patrick Matthäi <patrick.matthaei at web.de>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: password
+#. Description
+#: ../mumble-server.templates:1001
+msgid "Password to set on SuperUser account:"
+msgstr "Passwort für den SuperUser Benutzer:"
+
+#. Type: password
+#. Description
+#: ../mumble-server.templates:1001
+msgid ""
+"Murmur has a special account called \"SuperUser\" which bypasses all "
+"privilege checks."
+msgstr "Murmur hat einen administrativen Benutzer, der \"SuperUser\" heisst, "
+"der alle administrativen Privilegien besitzt."
+
+#. Type: password
+#. Description
+#: ../mumble-server.templates:1001
+msgid ""
+"If you set a password here, the password for the \"SuperUser\" account will "
+"be updated."
+msgstr "Wenn du ein Passwort nun setzt, wird das Passwort für den \"SuperUser\" "
+"Benutzer neu gesetzt."
+
+#. Type: password
+#. Description
+#: ../mumble-server.templates:1001
+msgid "If you leave this blank, the password will not be changed."
+msgstr "Wenn du dieses Feld leer lässt, wird das Passwort nicht geändert."
+
+#. Type: boolean
+#. Description
+#: ../mumble-server.templates:2001
+msgid "Autostart mumble-server on server boot?"
+msgstr "Mumble-server beim Booten automatisch starten?"
+
+#. Type: boolean
+#. Description
+#: ../mumble-server.templates:2001
+msgid ""
+"Mumble-server (murmurd) can start automatically when the server is booted."
+msgstr "Mumble-server (murmurd) kann automatisch gestartet werden, wenn der "
+"Server neu gestartet wird."
+
+#. Type: string
+#. Description
+#: ../mumble-server.templates:3001
+msgid "Email address to send registration emails from:"
+msgstr "E-Mail Adresse von der die Registrationsemails gesendet werden sollen:"
+
+#. Type: string
+#. Description
+#: ../mumble-server.templates:3001
+msgid ""
+"Murmur comes with a web-based registration script, which will send an "
+"authentication code to the user by email before registration can be "
+"completed."
+msgstr "Murmur enthält ein webbasiertes Regiestrierungsskript, welches einen "
+"Authentifizierungscode an den Benutzer über eine E-Mail sendet, damit die "
+"Registrierung abgeschlossen werden kann."
+
+#. Type: string
+#. Description
+#: ../mumble-server.templates:3001
+msgid ""
+"Set this to the email address you wish such authentication emails to come "
+"from. If you set it blank, registration will be disabled."
+msgstr "Setze dieses Feld zu der E-Mail Adresse von der die Authentifizierungs "
+"E-Mails kommen sollen. Wenn du das Feld leer lässt, wird die Registrierung "
+"deaktiviert."
Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=5333&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Wed Mar 19 21:46:08 2008
@@ -3,10 +3,12 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+
export DH_OPTIONS
configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
dh_testdir
qmake-qt4 main.pro DEFINES+=NO_UPDATE_CHECK DEFINES+=DEFAULT_SOUNDSYSTEM=ALSA
touch configure-stamp
@@ -19,7 +21,7 @@
$(MAKE) release
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-arch-stamp configure-stamp
@@ -27,6 +29,7 @@
# Unfortunately, static libraries are left over after
# qmake's makefile is done, as are the translations.
[ ! -f src/mumble/mumble_en.qm ] || rm -rf release debug src/mumble/*.qm
+ debconf-updatepo
dh_clean
install: install-indep install-arch
@@ -62,7 +65,7 @@
dh_installchangelogs CHANGES
dh_installdocs
dh_installmenu
- dh_installinit
+ dh_installinit -- defaults 95
dh_installman
dh_installlogrotate
dh_installdebconf
@@ -73,6 +76,7 @@
dh_compress
dh_fixperms
dh_perl $(CURDIR)/debian/mumble-server-web/usr/lib/cgi-bin/mumble-server
+ dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
More information about the Pkg-voip-commits
mailing list