Subject: [PATCH 3/8] Drop the mumble-server-web package altogether

From: Ron <[email-masked]>
Date: Mon, 9 Jul 2012 00:55:30 +0930

Upstream reports that it is unmaintained and "pretty useless anyway", which
seems to be well backed up by the fact that a call to Ice_intversion() was
added in March 2010, and that function has never existed in any version of
zeroc-ice ever.  Ice_intVersion was added to ice 3.2.1 though ...

Since it's taken this long for anyone to notice, we can be pretty sure
that there aren't any actual users of it.  Closes: #676815, #676816

This means we also get to drop all of the -indep package handling, since
there are no other indep packages to handle.

Fix the .PHONY target for this change and to add some things which were
missing from it that should be there.
---
 debian/MurmurPHP.ini                   |    1 -
 debian/control                         |   18 ----------------
 debian/mumble-server-web.README.Debian |    3 ---
 debian/mumble-server-web.conf          |   10 ---------
 debian/mumble-server-web.dirs          |    1 -
 debian/mumble-server-web.install       |    3 ---
 debian/mumble-server-web.links         |    1 -
 debian/mumble-server-web.postinst      |   35 --------------------------------
 debian/rules                           |   27 ++++++++----------------
 9 files changed, 9 insertions(+), 90 deletions(-)
 delete mode 100644 debian/MurmurPHP.ini
 delete mode 100644 debian/mumble-server-web.README.Debian
 delete mode 100644 debian/mumble-server-web.conf
 delete mode 100644 debian/mumble-server-web.dirs
 delete mode 100644 debian/mumble-server-web.install
 delete mode 100644 debian/mumble-server-web.links
 delete mode 100644 debian/mumble-server-web.postinst

diff --git a/debian/MurmurPHP.ini b/debian/MurmurPHP.ini
deleted file mode 100644
index 4937106..0000000
--- a/debian/MurmurPHP.ini
+++ /dev/null
@@ -1 +0,0 @@
-ice.slice=/usr/share/slice/Murmur.ice
diff --git a/debian/control b/debian/control
index 3f4cfdd..ead2c15 100644
--- a/debian/control
+++ b/debian/control
@@ -87,21 +87,3 @@ Description: Low latency VoIP client (debugging symbols)
  .
  This package contains the debugging symbols for the 'mumble' and
  'mumble-server' packages.
-
-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,
- ice34-translators | ice33-translators | ice32-translators | ice-translators,
- ice34-slice | 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
- custom textures and showing a list of currently connected users.
diff --git a/debian/mumble-server-web.README.Debian b/debian/mumble-server-web.README.Debian
deleted file mode 100644
index cd32ac1..0000000
--- a/debian/mumble-server-web.README.Debian
+++ /dev/null
@@ -1,3 +0,0 @@
-If you have got Apache running, you can get a server list on:
-
-	http://localhost/mumble-server/
diff --git a/debian/mumble-server-web.conf b/debian/mumble-server-web.conf
deleted file mode 100644
index bfd92f1..0000000
--- a/debian/mumble-server-web.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-Alias /mumble-server /usr/share/mumble-server-web/www/
-
-<Directory /usr/share/mumble-server-web/www/>
-	Options FollowSymLinks ExecCGI
-	AllowOverride None
-	AddHandler cgi-script .cgi
-	DirectoryIndex index.php
-	Order allow,deny
-	Allow from all
-</Directory>
diff --git a/debian/mumble-server-web.dirs b/debian/mumble-server-web.dirs
deleted file mode 100644
index 5f469d3..0000000
--- a/debian/mumble-server-web.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/mumble-server-web/www
diff --git a/debian/mumble-server-web.install b/debian/mumble-server-web.install
deleted file mode 100644
index 89326e4..0000000
--- a/debian/mumble-server-web.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/MurmurPHP.ini etc/php5/conf.d
-debian/mumble-server-web.conf etc/apache2/conf.d
-scripts/weblist.php usr/share/mumble-server-web/www
diff --git a/debian/mumble-server-web.links b/debian/mumble-server-web.links
deleted file mode 100644
index 1f73fb0..0000000
--- a/debian/mumble-server-web.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/mumble-server-web/www/weblist.php usr/share/mumble-server-web/www/index.php
diff --git a/debian/mumble-server-web.postinst b/debian/mumble-server-web.postinst
deleted file mode 100644
index 69f5ae6..0000000
--- a/debian/mumble-server-web.postinst
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh
-# postinst script for mumble-server-web
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
-	configure)
-		# Restart apache2 to load new config
-		invoke-rc.d --quiet apache2 reload
-	;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-	;;
-
-	*)
-		echo "postinst called with unknown argument \`$1'" >&2
-		exit 1
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 1731bd9..c443a88 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ configure-stamp:
 	DEFINES*=HAVE_ENDIAN_H
 	touch configure-stamp
 
-build: build-arch build-indep
+build: build-arch
 
 build-arch: build-arch-stamp
 
@@ -40,14 +40,13 @@ build-arch-stamp: configure-stamp
 	slice2html -I/usr/share/Ice-3.4.1/slice -I/usr/share/Ice-3.3.1/slice -I/usr/share/Ice/slice src/murmur/Murmur.ice --output-dir Ice
 	touch $@
 
-build-indep: build-indep-stamp
+build-indep:
 
-build-indep-stamp:
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp
+	rm -f build-arch-stamp configure-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 	[ ! -d gendoc ] || rm -rf Ice
 	rm -rf release debug
@@ -56,15 +55,7 @@ clean:
 	debconf-updatepo
 	dh_clean
 
-install: install-indep install-arch
-
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs -i
-	dh_install -i
-	install -m 0755 -D ./scripts/weblist.pl $(CURDIR)/debian/mumble-server-web/usr/share/mumble-server-web/www/weblist.cgi
+install: install-arch
 
 install-arch:
 	dh_testdir
@@ -95,22 +86,22 @@ binary-common:
 	dh_strip --dbg-package=mumble-dbg
 	dh_compress
 	dh_fixperms
-	dh_perl $(CURDIR)/debian/mumble-server-web/usr/lib/cgi-bin/mumble-server
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+binary-indep:
 
 binary-arch: build-arch install-arch
 	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
-binary:	binary-indep binary-arch
+binary:	binary-arch
 
 get-orig-source:
 	wget -O $(SOURCE_DIR)/mumble_$(VERSION).orig.tar.gz http://mumble.info/snapshot/mumble-$(VERSION).tar.gz
 
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+.PHONY: clean configure build build-arch build-indep \
+        binary binary-arch binary-indep binary-common \
+        install install-arch
-- 
1.7.10.4