mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor Ubuntu fixes

Browse Source 
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@877 05730e5d-ab1b-0410-a4ac-84af385074fa
This commit is contained in:
Thorvald Natvig 2007-12-02 13:38:33 +00:00
parent 2449c35e9c
commit c286eed0e4
10 changed files with 25 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
debian/changelog vendored
View File

@ -1,36 +1,5 @@
mumble (1.1.1-0ubuntu1) hardy; urgency=low
* Bugfixes
* Packaging for inclusion in universe (LP #129081)
* Packaging for inclusion in ubuntu universe (LP: #129081)
-- Thorvald Natvig <slicer@users.sourceforge.net> Fri, 09 Nov 2007 01:00:00 +0200
mumble (1.1.0) gutsy; urgency=low
* Multiserver support
-- Thorvald Natvig <slicer@users.sourceforge.net> Fri, 19 Oct 2007 14:15:00 +0200
mumble (1.0.0) feisty; urgency=low
* Bugfix release
-- Thorvald Natvig <slicer@users.sourceforge.net> Tue, 27 Jun 2007 13:35:20 +0200
mumble (0.9.5) feisty; urgency=low
* Embedded speex
-- Thorvald Natvig <slicer@users.sourceforge.net> Tue, 12 Jun 2007 13:48:10 +0200
mumble (0.9.4) edgy; urgency=low
* Global shortcuts working
-- Thorvald Natvig <slicer@users.sourceforge.net> Sat, 14 Oct 2006 15:54:32 +0200
mumble (0.9.3) dapper; urgency=low
* Initial Release.
-- Thorvald Natvig <slicer@users.sourceforge.net> Thu, 28 Sep 2006 16:31:58 +0200

2
debian/control vendored
View File

@ -4,7 +4,7 @@ XSBC-Original-Maintainer: Thorvald Natvig <slicer@users.sourceforge.net>
Section: sound
Priority: optional
Homepage: http://mumble.sourceforge.net/
Build-Depends: debhelper (>= 5.0.0), libqt4-dev (>= 4.3.0), libboost-dev (>= 1.34.1), libasound2-dev (>= 1.0.14), libxevie-dev (>= 1.0.2), libpulse-dev (>= 0.9.6)
Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.3.0), libboost-dev (>= 1.34.1), libasound2-dev (>= 1.0.14), libxevie-dev (>= 1.0.2), libpulse-dev (>= 0.9.6)
Standards-Version: 3.7.2.2
Package: mumble

2
debian/copyright vendored
View File

@ -25,7 +25,7 @@ License:
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
Public License can be found in `/usr/share/common-licenses/GPL-2'.
This package includes a modified version of Speex in the speex/ directory.

0
scripts/mumble.gconf-defaults → debian/mumble.gconf-defaults vendored
View File

6
debian/mumble.install vendored Normal file
View File

@ -0,0 +1,6 @@
icons/mumble.xpm /usr/share/pixmaps
scripts/mumble.desktop /usr/share/applications
scripts/mumble.protocol /usr/share/services
release/mumble /usr/bin
scripts/mumble-overlay /usr/bin
release/libmumble.so.1.1.1 /usr/lib

2
debian/mumble.manpages vendored Normal file
View File

@ -0,0 +1,2 @@
man/mumble.1
man/mumble-overlay.1

3
debian/murmur.install vendored
View File

@ -1 +1,2 @@
release/murmurd /usr/sbin
scripts/murmur.conf /etc/dbus-1/system.d

1
debian/murmur.manpages vendored Normal file
View File

@ -0,0 +1 @@
man/murmurd.1

36
debian/rules vendored
View File

@ -9,7 +9,7 @@ export DH_OPTIONS
configure: configure-stamp
configure-stamp:
dh_testdir
qmake-qt4 main.pro DEFINES+=NO_UPDATE_CHECK DEFINES+=DEFAULT_SOUNDSYSTEM=PulseAudio
qmake-qt4 main.pro DEFINES+=NO_UPDATE_CHECK DEFINES+=DEFAULT_SOUNDSYSTEM=ALSA
touch configure-stamp
@ -37,42 +37,26 @@ clean: configure-stamp
install: build
dh_testdir
dh_testroot
dh_clean -k -s
dh_installdirs -s
dh_clean -k
dh_installdirs
dh_install
install -m 0755 -D ./release/mumble $(CURDIR)/debian/mumble/usr/bin/mumble
install -m 0755 -D ./scripts/mumble-overlay $(CURDIR)/debian/mumble/usr/bin/mumble-overlay
install -m 0644 -D ./release/libmumble.so.1.1.1 $(CURDIR)/debian/mumble/usr/lib/libmumble.so.1.1.1
# Add debian files
install -m 0755 ./scripts/murmur.init $(CURDIR)/debian
install -D -m 0644 ./debian/mumble.lintian-override $(CURDIR)/debian/mumble/usr/share/lintian/overrides/mumble
install -D -m 0644 ./debian/mumble.linda-override $(CURDIR)/debian/mumble/usr/share/linda/overrides/mumble
# install menu entry, both using debian menu and desktoplink
install -m 0644 -D ./scripts/mumble.desktop $(CURDIR)/debian/mumble/usr/share/applications/mumble.desktop
install -m 0644 -D ./scripts/mumble.protocol $(CURDIR)/debian/mumble/usr/share/services/mumble.protocol
# install mumble files that need to be renamed
install -m 0644 -D ./icons/mumble.16x16.png $(CURDIR)/debian/mumble/usr/share/icons/hicolor/apps/16x16/mumble.png
install -m 0644 -D ./icons/mumble.32x32.png $(CURDIR)/debian/mumble/usr/share/icons/hicolor/apps/32x32/mumble.png
install -m 0644 -D ./icons/mumble.48x48.png $(CURDIR)/debian/mumble/usr/share/icons/hicolor/apps/48x48/mumble.png
install -m 0644 -D ./icons/mumble.64x64.png $(CURDIR)/debian/mumble/usr/share/icons/hicolor/apps/64x64/mumble.png
install -m 0644 -D ./icons/mumble.xpm $(CURDIR)/debian/mumble/usr/share/pixmaps/mumble.xpm
# And man pages
install -m 0644 -D ./man/mumble.1 $(CURDIR)/debian/mumble/usr/share/man/man1/mumble.1
install -m 0644 -D ./man/mumble-overlay.1 $(CURDIR)/debian/mumble/usr/share/man/man1/mumble-overlay.1
# install murmur
install -D -m 0755 ./release/murmurd $(CURDIR)/debian/murmur/usr/sbin/murmurd
install -D -m 0644 ./man/murmurd.1 $(CURDIR)/debian/murmur/usr/share/man/man1/murmurd.1
install -D -m 0644 ./scripts/murmur.conf $(CURDIR)/debian/murmur/etc/dbus-1/system.d/murmur.conf
# install rest of murmur files (rename & permissions)
install -D -m 0644 ./scripts/murmur.ini.system $(CURDIR)/debian/murmur/etc/murmur.ini
install -D -m 0755 ./scripts/murmur.pl $(CURDIR)/debian/murmur/usr/lib/cgi-bin/murmur/register.cgi
install -D -m 0755 ./scripts/weblist.pl $(CURDIR)/debian/murmur/usr/lib/cgi-bin/murmur/list.cgi
# Add debian files
install -m 0755 ./scripts/murmur.init $(CURDIR)/debian
install -m 0644 ./scripts/mumble.gconf-defaults $(CURDIR)/debian
install -D -m 0644 ./debian/mumble.lintian-override $(CURDIR)/debian/mumble/usr/share/lintian/overrides/mumble
install -D -m 0644 ./debian/mumble.linda-override $(CURDIR)/debian/mumble/usr/share/linda/overrides/mumble
dh_install -s
binary-common:
dh_testdir
dh_testroot

2
src/mumble/mumble.pro
View File

@ -7,7 +7,7 @@ HEADERS = BanEditor.h ACLEditor.h Log.h AudioConfigDialog.h AudioStats.h AudioI
SOURCES = BanEditor.cpp ACLEditor.cpp Log.cpp AudioConfigDialog.cpp AudioStats.cpp AudioInput.cpp AudioOutput.cpp main.cpp MainWindow.cpp ServerHandler.cpp About.cpp ConnectDialog.cpp Settings.cpp Database.cpp VersionCheck.cpp Global.cpp PlayerModel.cpp Audio.cpp ConfigDialog.cpp Plugins.cpp LookConfig.cpp Overlay.cpp AudioWizard.cpp ViewCert.cpp Messages.cpp TextMessage.cpp GlobalShortcut.cpp
HEADERS += ../ACL.h ../Group.h ../Channel.h ../Connection.h ../Player.h
SOURCES += ../ACL.cpp ../Group.cpp ../Channel.cpp ../Message.cpp ../Connection.cpp ../Player.cpp ../Timer.cpp ../CryptState.cpp
DIST += licenses.h mumble.ico mumble.xpm firmumble.inc plugins/mumble_plugin.h mumble-overlay mumble.desktop mumble.protocol mumble.gconf-defaults murmur_pch.h
DIST += licenses.h mumble.ico mumble.xpm firmumble.inc plugins/mumble_plugin.h mumble-overlay mumble.desktop mumble.protocol murmur_pch.h
INCLUDEPATH += ../../speex/include ../../speex/libspeex ../../speexbuild
LIBS += -lspeex
RESOURCES += mumble.qrc