Subject: [PATCH 7/8] alter debian/ files for embedded celt

From: Christopher Knadle <[email-masked]>
Date: Wed, 1 Aug 2012 06:37:20 -0400

- requests bundled-celt in debian/rules
 - releases libcelt0.so.0.7.0 with mumble package via debian/mumble.install
 - removes dependency on libcelt in debian/control
---
 debian/control        |    2 --
 debian/mumble.install |    2 +-
 debian/rules          |    1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index b360e0f..066ad12 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends: debhelper (>= 7.0.8), g++-4.6,
  libogg-dev,
  libspeex-dev,
  libspeexdsp-dev,
- libcelt-dev (>= 0.7.0),
  libsndfile1-dev,
  libssl-dev,
  libzeroc-ice34-dev (>= 3.4.2-8.1),
@@ -37,7 +36,6 @@ Package: mumble
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- libcelt0 (>= 0.7.0) | libcelt0-0 (>= 0.7.1~),
  libqt4-sql-sqlite,
  lsb-release
 Recommends: speech-dispatcher
diff --git a/debian/mumble.install b/debian/mumble.install
index 4a03dfd..fdb81ed 100644
--- a/debian/mumble.install
+++ b/debian/mumble.install
@@ -1,6 +1,6 @@
 release/mumble usr/bin/
 release/libmumble.so* usr/lib/mumble/
-#release/libcelt0.so.?.?.? usr/lib/mumble/
+release/libcelt0.so.?.?.? usr/lib/mumble/
 release/plugins/lib*.so usr/lib/mumble/
 icons/mumble.xpm usr/share/pixmaps/
 icons/mumble.svg usr/share/icons/hicolor/scalable/apps/
diff --git a/debian/rules b/debian/rules
index 935aeb1..38e12a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ configure-stamp:
 	CONFIG*=release \
 	CONFIG*=symbols \
 	CONFIG*=no-embed-qt-translations \
+	CONFIG*=bundled-celt \
 	CONFIG*=packaged \
 	CONFIG*=quiet-build-log \
 	DEFINES*=NO_UPDATE_CHECK \
-- 
1.7.10.4