diff --git a/debian/changelog b/debian/changelog index a4a59522f..68b3935e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 09 Nov 2007 01:00:00 +0200 - -mumble (1.1.0) gutsy; urgency=low - - * Multiserver support - - -- Thorvald Natvig Fri, 19 Oct 2007 14:15:00 +0200 - -mumble (1.0.0) feisty; urgency=low - - * Bugfix release - - -- Thorvald Natvig Tue, 27 Jun 2007 13:35:20 +0200 - -mumble (0.9.5) feisty; urgency=low - - * Embedded speex - - -- Thorvald Natvig Tue, 12 Jun 2007 13:48:10 +0200 - -mumble (0.9.4) edgy; urgency=low - - * Global shortcuts working - - -- Thorvald Natvig Sat, 14 Oct 2006 15:54:32 +0200 - -mumble (0.9.3) dapper; urgency=low - - * Initial Release. - - -- Thorvald Natvig Thu, 28 Sep 2006 16:31:58 +0200 diff --git a/debian/control b/debian/control index d27f1b1d9..58a504dfa 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ XSBC-Original-Maintainer: Thorvald Natvig 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 diff --git a/debian/copyright b/debian/copyright index e4914cba7..0718ceb6d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -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. diff --git a/scripts/mumble.gconf-defaults b/debian/mumble.gconf-defaults similarity index 100% rename from scripts/mumble.gconf-defaults rename to debian/mumble.gconf-defaults diff --git a/debian/mumble.install b/debian/mumble.install new file mode 100644 index 000000000..40d58b990 --- /dev/null +++ b/debian/mumble.install @@ -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 diff --git a/debian/mumble.manpages b/debian/mumble.manpages new file mode 100644 index 000000000..cbc925227 --- /dev/null +++ b/debian/mumble.manpages @@ -0,0 +1,2 @@ +man/mumble.1 +man/mumble-overlay.1 diff --git a/debian/murmur.install b/debian/murmur.install index 8b1378917..2505cb6a2 100644 --- a/debian/murmur.install +++ b/debian/murmur.install @@ -1 +1,2 @@ - +release/murmurd /usr/sbin +scripts/murmur.conf /etc/dbus-1/system.d diff --git a/debian/murmur.manpages b/debian/murmur.manpages new file mode 100644 index 000000000..2f38e539a --- /dev/null +++ b/debian/murmur.manpages @@ -0,0 +1 @@ +man/murmurd.1 diff --git a/debian/rules b/debian/rules index e2a981b46..fa3bb63cf 100755 --- a/debian/rules +++ b/debian/rules @@ -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 diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro index 374d207e9..c699bf01e 100644 --- a/src/mumble/mumble.pro +++ b/src/mumble/mumble.pro @@ -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