[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8.10-3-7-g0f6d47b
Mirco Bauer
meebey at meebey.net
Wed May 15 19:42:57 UTC 2013
The following commit has been merged in the master branch:
commit 93367337c9a263aa1a7f3b1b9a7f1c71befd9e1e
Author: Mirco Bauer <meebey at meebey.net>
Date: Wed May 15 20:58:10 2013 +0200
Merged smuxi-server, smuxi-engine-irc, smuxi-engine-twitter, smuxi-engine-xmpp, and smuxi-frontend-gnome-irc into smuxi-engine and smuxi-frontend-gnome
diff --git a/debian/control b/debian/control
index 3dcf73f..50138d3 100644
--- a/debian/control
+++ b/debian/control
@@ -35,11 +35,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/smuxi.git
Package: smuxi
Architecture: all
-Suggests: smuxi-server
Depends: ${misc:Depends},
- smuxi-frontend-gnome-irc (= ${source:Version}),
- smuxi-engine-twitter (= ${source:Version}),
- smuxi-engine-xmpp (= ${source:Version})
+ smuxi-frontend-gnome (= ${source:Version}),
Description: graphical IRC client
Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform IRC
client for sophisticated users, targeting the GNOME desktop.
@@ -59,108 +56,20 @@ Description: graphical IRC client
Package: smuxi-engine
Architecture: all
-Replaces: smuxi (<< 0.5.25)
-Recommends: smuxi-engine-irc,
- smuxi-engine-twitter,
- smuxi-engine-xmpp
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${cli:Depends}
-Description: Engine library for Smuxi
- Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform IRC
- client for sophisticated users, targeting the GNOME desktop.
- .
- Smuxi is based on the client-server model: The core application (engine) can
- be placed onto a server which is connected to the Internet around-the-clock;
- one or more frontends then connect to the core. This way, the connection to
- IRC can be kept up even when all frontends have been closed. The combination
- of screen and irssi served as example for this architecture.
- .
- Smuxi also supports the regular single application mode. This behaves like a
- typical IRC client; it doesn't need separate core management and utilizes a
- local engine that is used by the local frontend client.
- .
- This package contains the Smuxi engine, needed by Smuxi frontends or the
- standalone server.
-
-Package: smuxi-engine-irc
-Architecture: all
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${cli:Depends},
- smuxi-engine (= ${source:Version})
+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-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-server (<< 0.8.10.2)
Suggests: oidentd | ident-server
-Description: IRC engine for Smuxi
- Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform IRC
- client for sophisticated users, targeting the GNOME desktop.
- .
- Smuxi is based on the client-server model: The core application (engine) can
- be placed onto a server which is connected to the Internet around-the-clock;
- one or more frontends then connect to the core. This way, the connection to
- IRC can be kept up even when all frontends have been closed. The combination
- of screen and irssi served as example for this architecture.
- .
- Smuxi also supports the regular single application mode. This behaves like a
- typical IRC client; it doesn't need separate core management and utilizes a
- local engine that is used by the local frontend client.
- .
- This package contains the IRC engine for Smuxi.
-
-Package: smuxi-engine-twitter
-Architecture: all
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${cli:Depends},
- smuxi-engine (= ${source:Version})
-Description: Twitter engine for Smuxi
- Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform IRC
- client for sophisticated users, targeting the GNOME desktop.
- .
- Smuxi is based on the client-server model: The core application (engine) can
- be placed onto a server which is connected to the Internet around-the-clock;
- one or more frontends then connect to the core. This way, the connection to
- IRC can be kept up even when all frontends have been closed. The combination
- of screen and irssi served as example for this architecture.
- .
- Smuxi also supports the regular single application mode. This behaves like a
- typical IRC client; it doesn't need separate core management and utilizes a
- local engine that is used by the local frontend client.
- .
- This package contains the Twitter engine for Smuxi. This plugin allows you
- to receive and post tweets to the Twitter microblogging service. It
- supports the friends timeline, replies view, and direct messages.
-
-Package: smuxi-engine-xmpp
-Architecture: all
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${cli:Depends},
- smuxi-engine (= ${source:Version})
-Description: XMPP / Jabber / GTalk / Facebook Chat engine for Smuxi
- Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform IRC
- client for sophisticated users, targeting the GNOME desktop.
- .
- Smuxi is based on the client-server model: The core application (engine) can
- be placed onto a server which is connected to the Internet around-the-clock;
- one or more frontends then connect to the core. This way, the connection to
- IRC can be kept up even when all frontends have been closed. The combination
- of screen and irssi served as example for this architecture.
- .
- Smuxi also supports the regular single application mode. This behaves like a
- typical IRC client; it doesn't need separate core management and utilizes a
- local engine that is used by the local frontend client.
- .
- This package contains the XMPP engine for Smuxi. This plugin allows you
- to receive and send messages on XMPP, Jabber, GTalk and the Facebook chat.
-
-Package: smuxi-server
-Architecture: all
-Replaces: smuxi (<< 0.5.25)
Depends: ${shlibs:Depends},
${misc:Depends},
- ${cli:Depends},
- smuxi-engine (= ${source:Version})
-Description: Server application for Smuxi
+ ${cli:Depends}
+Description: Engine libraries for Smuxi
Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform IRC
client for sophisticated users, targeting the GNOME desktop.
.
@@ -174,43 +83,29 @@ Description: Server application for Smuxi
typical IRC client; it doesn't need separate core management and utilizes a
local engine that is used by the local frontend client.
.
- This package contains the standalone server of Smuxi, it doesn't need any GUI.
+ This package contains the Smuxi engines, needed by Smuxi frontends or the
+ standalone server. The standalone server of Smuxi doesn't need any GUI.
The Smuxi frontends can connect to a running server via the network.
-
-Package: smuxi-frontend
-Architecture: all
-Replaces: smuxi (<< 0.5.25)
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${cli:Depends},
- smuxi-engine (= ${source:Version})
-Description: Frontend library for Smuxi
- Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform IRC
- client for sophisticated users, targeting the GNOME desktop.
.
- Smuxi is based on the client-server model: The core application (engine) can
- be placed onto a server which is connected to the Internet around-the-clock;
- one or more frontends then connect to the core. This way, the connection to
- IRC can be kept up even when all frontends have been closed. The combination
- of screen and irssi served as example for this architecture.
- .
- Smuxi also supports the regular single application mode. This behaves like a
- typical IRC client; it doesn't need separate core management and utilizes a
- local engine that is used by the local frontend client.
- .
- This package contains the base library for all Smuxi frontends.
+ The following Smuxi engines are included:
+ * IRC engine
+ * Twitter engine
+ - receive and post tweets to the Twitter microblogging service.
+ - friends timeline, replies view, and direct messages.
+ * XMPP engine
+ - receive and send messages on XMPP, Jabber, GTalk and the Facebook chat.
Package: smuxi-frontend-gnome
Architecture: all
-Replaces: smuxi (<< 0.5.25)
-Recommends: smuxi-frontend-gnome-irc (= ${source:Version}),
- ssh-askpass-gnome | ssh-askpass,
+Replaces: smuxi (<< 0.5.25),
+ smuxi-frontend-gnome-irc (<< 0.8.10.2)
+Conflicts: smuxi-frontend-gnome-irc (<< 0.8.10.2)
+Recommends: ssh-askpass-gnome | ssh-askpass,
notification-daemon
Depends: ${shlibs:Depends},
${misc:Depends},
${cli:Depends},
smuxi-engine (= ${source:Version}),
- smuxi-frontend (= ${source:Version}),
librsvg2-common
Description: GNOME frontend for Smuxi
Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform IRC
@@ -229,38 +124,12 @@ Description: GNOME frontend for Smuxi
This package contains the GNOME frontend of Smuxi, it can run either standalone
using a local engine or connect to a running remote engine (server).
-Package: smuxi-frontend-gnome-irc
-Architecture: all
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${cli:Depends},
- smuxi-engine (= ${source:Version}),
- smuxi-engine-irc (= ${source:Version}),
- smuxi-frontend (= ${source:Version}),
- smuxi-frontend-gnome (= ${source:Version})
-Description: IRC support for GNOME frontend for Smuxi
- Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform IRC
- client for sophisticated users, targeting the GNOME desktop.
- .
- Smuxi is based on the client-server model: The core application (engine) can
- be placed onto a server which is connected to the Internet around-the-clock;
- one or more frontends then connect to the core. This way, the connection to
- IRC can be kept up even when all frontends have been closed. The combination
- of screen and irssi served as example for this architecture.
- .
- Smuxi also supports the regular single application mode. This behaves like a
- typical IRC client; it doesn't need separate core management and utilizes a
- local engine that is used by the local frontend client.
- .
- This package contains enhanced IRC support for the GNOME frontend of Smuxi.
-
Package: smuxi-frontend-stfl
Architecture: all
Depends: ${shlibs:Depends},
${misc:Depends},
${cli:Depends},
smuxi-engine (= ${source:Version}),
- smuxi-frontend (= ${source:Version})
Description: STFL frontend for Smuxi (experimental)
Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform IRC
client for sophisticated users, targeting the GNOME desktop.
diff --git a/debian/smuxi-engine-irc.install b/debian/smuxi-engine-irc.install
deleted file mode 100644
index 5f5c413..0000000
--- a/debian/smuxi-engine-irc.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/smuxi/smuxi-engine-irc.dll*
-usr/lib/smuxi/Meebey.SmartIrc4net.dll*
-usr/share/locale/*/LC_MESSAGES/smuxi-engine-irc.mo
diff --git a/debian/smuxi-engine-twitter.install b/debian/smuxi-engine-twitter.install
deleted file mode 100644
index 0ae7400..0000000
--- a/debian/smuxi-engine-twitter.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/smuxi/smuxi-engine-twitter.dll*
-usr/lib/smuxi/Twitterizer2.dll*
-usr/lib/smuxi/Newtonsoft.Json.dll*
-usr/share/locale/*/LC_MESSAGES/smuxi-engine-twitter.mo
diff --git a/debian/smuxi-engine-xmpp.install b/debian/smuxi-engine-xmpp.install
deleted file mode 100644
index 0dddc56..0000000
--- a/debian/smuxi-engine-xmpp.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/smuxi/smuxi-engine-xmpp.dll*
-usr/lib/smuxi/jabber-net.dll*
diff --git a/debian/smuxi-engine.install b/debian/smuxi-engine.install
index 904a587..642eb20 100644
--- a/debian/smuxi-engine.install
+++ b/debian/smuxi-engine.install
@@ -1,4 +1,11 @@
+usr/bin/smuxi-server
usr/lib/smuxi/smuxi-common.dll*
-usr/lib/smuxi/smuxi-engine.dll*
+usr/lib/smuxi/smuxi-engine*.dll*
+usr/lib/smuxi/smuxi-server.exe*
usr/lib/smuxi/Db4objects.Db4o.dll*
-usr/share/locale/*/LC_MESSAGES/smuxi-engine.mo
+usr/lib/smuxi/Meebey.SmartIrc4net.dll*
+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-server.mo
diff --git a/debian/smuxi-frontend-gnome-irc.install b/debian/smuxi-frontend-gnome-irc.install
deleted file mode 100644
index 883d90b..0000000
--- a/debian/smuxi-frontend-gnome-irc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/smuxi/smuxi-frontend-gnome-irc.dll*
-usr/share/locale/*/LC_MESSAGES/smuxi-frontend-gnome-irc.mo
diff --git a/debian/smuxi-frontend-gnome.install b/debian/smuxi-frontend-gnome.install
index 5aa658a..718cc4c 100644
--- a/debian/smuxi-frontend-gnome.install
+++ b/debian/smuxi-frontend-gnome.install
@@ -1,5 +1,5 @@
usr/bin/smuxi-frontend-gnome
-usr/lib/smuxi/smuxi-frontend-gnome.exe*
+usr/lib/smuxi/smuxi-frontend-gnome*
usr/share/applications/smuxi-frontend-gnome.desktop
usr/share/icons/
-usr/share/locale/*/LC_MESSAGES/smuxi-frontend-gnome.mo
+usr/share/locale/*/LC_MESSAGES/smuxi-frontend-gnome*.mo
diff --git a/debian/smuxi-server.install b/debian/smuxi-server.install
deleted file mode 100644
index 3b563bf..0000000
--- a/debian/smuxi-server.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/smuxi-server
-usr/lib/smuxi/smuxi-server.exe*
-usr/share/locale/*/LC_MESSAGES/smuxi-server.mo
--
smuxi
More information about the Pkg-cli-apps-commits
mailing list