[Pkg-voip-commits] r9641 - in /mumble/trunk/debian: changelog control rules

[pmatthaei at alioth.debian.org]

Author: pmatthaei
Date: Sun Apr  8 10:25:04 2012
New Revision: 9641

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9641
Log:
* Remove /usr/lib32 building.
  Closes: #667882

Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/control
    mumble/trunk/debian/rules

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=9641&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Sun Apr  8 10:25:04 2012
@@ -1,8 +1,10 @@
-mumble (1.2.3-313-ge5c4657-1) UNRELEASED; urgency=low
+mumble (1.2.3-313-ge5c4657-1) UNRELEASED; urgency=high
 
   * New upstream snapshot from 21.03.2012.
-
- -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 08 Apr 2012 12:04:29 +0200
+  * Remove /usr/lib32 building.
+    Closes: #667882
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 08 Apr 2012 12:24:29 +0200
 
 mumble (1.2.3-309-g7176ff4-1) unstable; urgency=low
 

Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=9641&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Sun Apr  8 10:25:04 2012
@@ -29,9 +29,7 @@
  libprotobuf-dev,
  libavahi-compat-libdnssd-dev,
  libxi-dev,
- libcap-dev [linux-any],
- libc6-dev-i386 [amd64],
- gcc-multilib [amd64]
+ libcap-dev [linux-any]
 Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/pkg-voip/mumble/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/mumble/

Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=9641&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Sun Apr  8 10:25:04 2012
@@ -39,9 +39,6 @@
 
 build-arch-stamp: configure-stamp
 	$(MAKE) release
-ifeq ($(DEB_BUILD_ARCH), amd64)
-	(cd overlay_gl && touch overlay.c && $(MAKE) clean && $(MAKE) release DESTDIR_ADD=-32 CFLAGS_ADD=-m32 LFLAGS_ADD=-m32 && $(MAKE) clean)
-endif
 	touch $@
 
 build-indep: build-indep-stamp
@@ -83,10 +80,6 @@
 	install -m 0755 ./scripts/murmur.logrotate $(CURDIR)/debian/mumble-server.logrotate
 	install -m 0644 -D ./scripts/murmur.conf $(CURDIR)/debian/mumble-server/etc/dbus-1/system.d/mumble-server.conf
 	install -m 0644 -D ./scripts/murmur.ini.system $(CURDIR)/debian/mumble-server/etc/mumble-server.ini
-ifeq ($(DEB_BUILD_ARCH), amd64)
-	install -m 0755 -d $(CURDIR)/debian/mumble/usr/lib32/mumble
-	cp -dp ./release-32/libmumble.so* $(CURDIR)/debian/mumble/usr/lib32/mumble/
-endif
 
 binary-common:
 	dh_testdir
@@ -107,7 +100,7 @@
 	dh_fixperms
 	dh_perl $(CURDIR)/debian/mumble-server-web/usr/lib/cgi-bin/mumble-server
 	dh_installdeb
-	dh_shlibdeps -Xlib32/mumble/
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb