[Pkg-cli-apps-commits] [SCM] smuxi branch, lucid-backports, updated. debian/0.8.9.1-3_lucid+1
Mirco Bauer
meebey at meebey.net
Sun Jan 8 13:16:37 UTC 2012
The following commit has been merged in the lucid-backports branch:
commit 0c2cd48f90b386f7efa3c61fb5a2e6fcf4195ff2
Merge: c9ef400553d5d2cb184316c415c7466eab9e386e 9b784a2707936b6ba01a13793b1aede57da070c0
Author: Mirco Bauer <meebey at meebey.net>
Date: Sun Jan 8 01:37:03 2012 +0100
Merge branch 'master' into lucid-backports
Conflicts:
debian/changelog
diff --combined debian/changelog
index 2b01c38,7cc32e5..370d8d0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,96 +1,105 @@@
- smuxi (0.8-1~lucid+4) lucid; urgency=low
++smuxi (0.8.9.1-3~lucid+1) lucid; urgency=low
+
+ * debian/control:
+ + Ensure libindicate4 it pulled in from the PPA
++ + Added manual libindicate4 dependency as libindicate0.1-cil fails to
++ depend on it.
+
+ -- Mirco Bauer <meebey at debian.org> Tue, 07 Sep 2010 00:05:12 +0200
+
- smuxi (0.8-1~lucid+3) lucid; urgency=low
+ smuxi (0.8.9.1-3) unstable; urgency=low
- * debian/control:
- + Added manual libindicate4 dependency as libindicate0.1-cil fails to
- depend on it.
+ * [7cd3a08] Ignore secur32(.dll) ModuleRef for dh_clideps
+ * [0055fc3] Added missing ncurses dllmap for smuxi-frontend-stfl.exe
- -- Mirco Bauer <meebey at debian.org> Mon, 06 Sep 2010 23:13:03 +0200
+ -- Mirco Bauer <meebey at debian.org> Sat, 07 Jan 2012 12:13:22 +0100
- smuxi (0.8-1~lucid+2) lucid; urgency=low
+ smuxi (0.8.9.1-2) unstable; urgency=low
- * debian/control
- debian/rules:
- + Re-added libindicate0.1-cil-dev build-dep as libindicate 0.4 is now part
- of the Smuxi PPA.
+ * [d3a922c] Added new Db4objects.Db4o library to smuxi-engine package
- -- Mirco Bauer <meebey at debian.org> Mon, 06 Sep 2010 21:33:22 +0200
+ -- Mirco Bauer <meebey at debian.org> Wed, 04 Jan 2012 08:22:07 +0100
- smuxi (0.8-1~lucid+1) lucid; urgency=low
+ smuxi (0.8.9.1-1) unstable; urgency=low
- * Rebuild for lucid-ppa.
- * debian/control:
- + Removed libindicate0.1-cil-dev from build-deps as lucid doesn't contain
- libindicate >= 0.4.
+ * [7525843] Imported Upstream version 0.8.9.1
+ * [b492feb] Install new application icons
+
+ -- Mirco Bauer <meebey at debian.org> Tue, 03 Jan 2012 10:21:20 +0100
+
+ smuxi (0.8.9-1) unstable; urgency=low
+
+ * [0d666d8] Imported Upstream version 0.8.9
+ * [9ce1498] Dropped patches that are already applied upstream
+ * [1d7d863] Updated patches to build with the system default compiler
+ * [c0f6d11] Enabled and added STFL frontend packages
+ * [b992bc2] Enabled and added XMPP engine package
+ * [ad44b32] Added dbus-sharp to build-deps
+ * [cb1f671] Pass debian package version to configure script
+ * [88dd531] Added libstfl-dev to build-deps
+
+ -- Mirco Bauer <meebey at debian.org> Tue, 03 Jan 2012 09:31:38 +0100
+
+ smuxi (0.8-8) unstable; urgency=low
+
+ * [9290dca] Fix startup crash in smuxi-frontend-gnome when no notification
+ daemon is available (closes: #636348)
+ * [2c50896] Fix potential startup crash in smuxi-frontend-gnome when no
+ indicate daemon is available
+
+ -- Mirco Bauer <meebey at debian.org> Fri, 05 Aug 2011 22:14:57 +0200
+
+ smuxi (0.8-7) unstable; urgency=low
+
+ * [85d9b16] Refreshed build_Twitterizer2_with_default_compiler.patch
+ * [7982725] Use 3.0 (quilt) as source format, else ubuntu.series won't be
+ picked up by dpkg-source
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 26 Jun 2011 03:21:06 +0200
+
+ smuxi (0.8-6) unstable; urgency=low
+
+ * [3cd6eae] Build Newtonsoft.Json with the default compiler
+ * [ab87266] Build Twitterizer2 with default compiler
+ * [e13831a] Add useless ${misc:Depends} to smuxi meta package to please
+ lintian
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 26 Jun 2011 02:34:42 +0200
+
+ smuxi (0.8-5) unstable; urgency=low
+
+ * [e040217] Added suggests oidentd | ident-server to smuxi-engine-irc as IRC
+ servers might still use ident
+ * [c4b4dab] Added notification-daemon to recommends of smuxi-frontend-gnome
+ as most users like it
+ * [a76aa87] Fixed Ubuntu distro detection by making use of vendor-specific
+ patches with quilt
+ * [f0ae392] Fixed compile on Mono 2.10 by backporting 2 upstream patches
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 26 Jun 2011 01:04:53 +0200
+
+ smuxi (0.8-4) unstable; urgency=low
+
+ * [f7a2a37] Added smuxi-frontend-gnome-irc and ssh-askpass(-gnome) to
+ recommends of smuxi-frontend-gnome to ensure the user is not
+ missing important functionality.
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 08 May 2011 20:23:00 +0200
+
+ smuxi (0.8-3) unstable; urgency=medium
+
+ * [a518eb9] Refreshed quilt patches
+ * [d4d8e0b] Fixed crash when disposing desktop notifications.
+ (closes: #616984)
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 20 Mar 2011 16:41:20 +0100
+
+ smuxi (0.8-2) unstable; urgency=low
+
+ * Upload to unstable
+ * [069c0d7] Set debian and upstream branch back for git-buildpackage
- -- Mirco Bauer <meebey at debian.org> Mon, 06 Sep 2010 02:02:05 +0200
+ -- Mirco Bauer <meebey at debian.org> Tue, 08 Feb 2011 16:33:49 +0100
smuxi (0.8-1) experimental; urgency=low
diff --combined debian/control
index bd08dc5,3a682e4..bbd6e6f
--- a/debian/control
+++ b/debian/control
@@@ -2,7 -2,7 +2,7 @@@ Source: smux
Section: gnome
Priority: optional
Maintainer: Mirco Bauer <meebey at debian.org>
- Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~)
+ Build-Depends: debhelper (>= 7.0.50)
Build-Depends-Indep: cli-common-dev (>= 0.5.7),
mono-devel (>= 2.6),
mono-xbuild (>= 2.6),
@@@ -16,6 -16,9 +16,9 @@@
libart2.0-cil-dev (>= 2.8),
libnotify-cil-dev,
libindicate0.1-cil-dev,
+ libdbus1.0-cil-dev,
+ libdbus-glib1.0-cil-dev,
+ libstfl-dev (>= 0.21),
lsb-release,
pkg-config,
gettext,
@@@ -32,8 -35,10 +35,10 @@@ Vcs-Browser: http://git.debian.org/?p=p
Package: smuxi
Architecture: all
Suggests: smuxi-server
- Depends: smuxi-frontend-gnome-irc (= ${source:Version}),
- smuxi-engine-twitter (= ${source:Version})
+ Depends: ${misc:Depends},
+ smuxi-frontend-gnome-irc (= ${source:Version}),
+ smuxi-engine-twitter (= ${source:Version}),
+ smuxi-engine-xmpp (= ${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.
@@@ -55,7 -60,8 +60,8 @@@ Package: smuxi-engin
Architecture: all
Replaces: smuxi (<< 0.5.25)
Recommends: smuxi-engine-irc,
- smuxi-engine-twitter
+ smuxi-engine-twitter,
+ smuxi-engine-xmpp
Depends: ${shlibs:Depends},
${misc:Depends},
${cli:Depends}
@@@ -82,6 -88,7 +88,7 @@@ Depends: ${shlibs:Depends}
${misc:Depends},
${cli:Depends},
smuxi-engine (= ${source:Version})
+ 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.
@@@ -122,6 -129,29 +129,29 @@@ Description: Twitter engine for Smux
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)
@@@ -172,13 -202,15 +202,16 @@@ Description: Frontend library for Smux
Package: smuxi-frontend-gnome
Architecture: all
Replaces: smuxi (<< 0.5.25)
+ Recommends: smuxi-frontend-gnome-irc (= ${source:Version}),
+ ssh-askpass-gnome | ssh-askpass,
+ notification-daemon
Depends: ${shlibs:Depends},
${misc:Depends},
${cli:Depends},
smuxi-engine (= ${source:Version}),
smuxi-frontend (= ${source:Version}),
- librsvg2-common
+ librsvg2-common,
+ libindicate4 (>= 0.4.1)
Description: GNOME frontend for Smuxi
Smuxi is an irssi-inspired, flexible, user-friendly and cross-platform IRC
client for sophisticated users, targeting the GNOME desktop.
@@@ -220,3 -252,32 +253,32 @@@ Description: IRC support for GNOME fron
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.
+ .
+ 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 experimental STFL frontend of Smuxi, it can run
+ either standalone using a local engine or connect to a running
+ remote engine (server).
+ .
+ STFL is a library that uses ncurses to draw text based user interface using
+ a markup language (like Glade for GTK+). This frontend is in early alpha state
+ and lacks a lot of interface features and likes to crash.
diff --combined debian/gbp.conf
index 1762d90,1d014cb..0418d8a
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,10 -1,8 +1,10 @@@
+[DEFAULT]
+debian-branch = lucid-backports
[git-dch]
id-length = 7
meta = True
[git-import-orig]
postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
[DEFAULT]
- debian-branch = master-experimental
- upstream-branch = upstream-experimental
+ debian-branch = master
+ upstream-branch = upstream
--
smuxi
More information about the Pkg-cli-apps-commits
mailing list