[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8.10-3-7-g0f6d47b

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 3e89fa6c9739fe87160f55c38e159a836c86a757
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed May 15 21:31:09 2013 +0200

    Merged smuxi-frontend package into smuxi-engine

diff --git a/debian/control b/debian/control
index f31decc..b29601f 100644
--- a/debian/control
+++ b/debian/control
@@ -60,10 +60,12 @@ Replaces: smuxi (<< 0.5.25),
           smuxi-engine-irc (<< 0.8.10.2),
           smuxi-engine-twitter (<< 0.8.10.2),
           smuxi-engine-xmpp (<< 0.8.10.2),
+          smuxi-frontend (<< 0.8.10.2),
           smuxi-server (<< 0.8.10.2)
 Conflicts: smuxi-engine-irc (<< 0.8.10.2),
            smuxi-engine-twitter (<< 0.8.10.2),
            smuxi-engine-xmpp (<< 0.8.10.2),
+           smuxi-frontend (<< 0.8.10.2),
            smuxi-server (<< 0.8.10.2)
 Suggests: oidentd | ident-server
 Depends: ${shlibs:Depends},
diff --git a/debian/smuxi-engine.install b/debian/smuxi-engine.install
index 642eb20..ae6f246 100644
--- a/debian/smuxi-engine.install
+++ b/debian/smuxi-engine.install
@@ -1,6 +1,7 @@
 usr/bin/smuxi-server
 usr/lib/smuxi/smuxi-common.dll*
 usr/lib/smuxi/smuxi-engine*.dll*
+usr/lib/smuxi/smuxi-frontend.dll*
 usr/lib/smuxi/smuxi-server.exe*
 usr/lib/smuxi/Db4objects.Db4o.dll*
 usr/lib/smuxi/Meebey.SmartIrc4net.dll*
@@ -8,4 +9,5 @@ usr/lib/smuxi/Twitterizer2.dll*
 usr/lib/smuxi/Newtonsoft.Json.dll*
 usr/lib/smuxi/jabber-net.dll*
 usr/share/locale/*/LC_MESSAGES/smuxi-engine*.mo
+usr/share/locale/*/LC_MESSAGES/smuxi-frontend.mo
 usr/share/locale/*/LC_MESSAGES/smuxi-server.mo
diff --git a/debian/smuxi-frontend.install b/debian/smuxi-frontend.install
deleted file mode 100644
index 17f0c8a..0000000
--- a/debian/smuxi-frontend.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/smuxi/smuxi-frontend.dll*
-usr/share/locale/*/LC_MESSAGES/smuxi-frontend.mo

-- 
smuxi