Merge lp:~gilir/synapse-project/packaging into lp:synapse-project

[Julien Lavergne]

[Michal Hruby (mhr3)]

Could you please fix the conflict in po/* (probably by reverting anything you inadvertently changed there). Also I added optional dependency on app-indicator, could you add that?

review: Needs Fixing

[lp:~gilir/synapse-project/packaging]

220. By Alberto Aldegheri on 2010-12-04

Fixes to show/hide methods

221. By Michal Hruby on 2010-12-04

Add plugin for locking screen

222. By Michal Hruby on 2010-12-04

Merge (with a few changes) from lp:~and471/synapse-project/trivial-fixes

223. By Michal Hruby on 2010-12-05

Use proper licenses - LGPL2.1+ for core, GPL3 for UI

224. By Michal Hruby on 2010-12-05

Fix a few mistakes in last commit

225. By Michal Hruby on 2010-12-05

Make sure we recurse desktop file directories properly

226. By Alberto Aldegheri on 2010-12-05

menu consistency

227. By Michal Hruby on 2010-12-05

Add RelevancyService stub

228. By Michal Hruby on 2010-12-05

Right, we wanted to use GPL3 for the UI, not LGPL

229. By Michal Hruby on 2010-12-05

Merge from <lp:~gilir/synapse-project/packaging>

230. By Michal Hruby on 2010-12-05

Bump libzg depends

231. By Michal Hruby on 2010-12-05

Add build-depends on automake

232. By Michal Hruby on 2010-12-05

...and on libtool

233. By Michal Hruby on 2010-12-05

Fix typo

234. By Alberto Aldegheri on 2010-12-06

Use window type hint DOCK to steal the focus

235. By Alberto Aldegheri on 2010-12-06

Use type hint DIALOG to fix wrong behaviour with Mutter and always-on-top windows

236. By Alberto Aldegheri on 2010-12-06

Connect to window state event to make sure that keep above is still there.

237. By Michal Hruby on 2010-12-06

Let's support a little bit of relevancy

238. By Michal Hruby on 2010-12-06

Fix a bug

239. By Michal Hruby on 2010-12-06

Don't set pager and taskbar hint inside window-state-event handler

240. By Alberto Aldegheri on 2010-12-06

Fix to Banshee and Rhythmbox detection

241. By Michal Hruby on 2010-12-06

Add option to disable notification icon

242. By Michal Hruby on 2010-12-06

We don't wanna hear the C warnings

243. By Michal Hruby on 2010-12-06

Add ability to browse also recently launched applications

244. By Alberto Aldegheri on 2010-12-07

Mixed RTL/LTR fix

245. By Michal Hruby on 2010-12-07

Add ExtendedInfo interface

246. By Michal Hruby on 2010-12-07

Yey for committing non-working code

247. By Alberto Aldegheri on 2010-12-07

Extended info support on MatchRenderer - reorganized rendering

248. By Alberto Aldegheri on 2010-12-07

Added Comments in ui-interface.vala

249. By Alberto Aldegheri on 2010-12-07

Some comments added and my (C) on some files

250. By Alberto Aldegheri on 2010-12-07

Fix typo huge error in Rhythmbox Plugin

251. By Michal Hruby on 2010-12-07

Cleaning up...

252. By Alberto Aldegheri on 2010-12-08

Fix to non-animated ListView. Now animated widgets read config for: ui.widgets.animation-enabled, and, ui.widgets.extended-info-enabled.

253. By Michal Hruby on 2010-12-08

Minor changes

254. By Alberto Aldegheri on 2010-12-08

Removed Singleton from ColorHelper, now you must initialize it into your widget, so it listen on style_set, also it uses less memory

255. By Alberto Aldegheri on 2010-12-08

Color adjustments, and now Synapse supports custom gtkrc, see line 32 in ui-cairo-gtk-base.vala

256. By Michal Hruby on 2010-12-08

Update translation template

257. By Alberto Aldegheri on 2010-12-08

Visual bugfix - MenuButton is not using its style.

258. By Alberto Aldegheri on 2010-12-08

Fix a bug in ListView

259. By Alberto Aldegheri on 2010-12-09

Fix to colors in dark themes

260. By Alberto Aldegheri on 2010-12-09

Added a sample gtkrc for Synapse custom style

261. By Alberto Aldegheri on 2010-12-09

Stupid me.

262. By Alberto Aldegheri on 2010-12-09

Nicer selection on ListView. Now the label fades the color.

263. By Alberto Aldegheri on 2010-12-09

UI visual fixes

264. By Alberto Aldegheri on 2010-12-09

In MatchRenderer Hilight title only when the row is fully selected (animation ended)

265. By Alberto Aldegheri on 2010-12-09

Stupid me. Fix compile errors

266. By Alberto Aldegheri on 2010-12-09

Stupid me. Fix compile errors

267. By Michal Hruby on 2010-12-09

Change relevancy computation.. again

268. By Michal Hruby on 2010-12-09

Change relevancy computation.. again

269. By Michal Hruby on 2010-12-10

Fix bug #685634

270. By Julien Lavergne on 2010-12-10

Call dh_strip for the dbg package.

271. By Julien Lavergne on 2010-12-10

Add a debug binary.

272. By Julien Lavergne on 2010-12-13

* debian/synapse.install:
 - Install all files in synapse binary.

273. By Julien Lavergne on 2010-12-13

Pass --fail-missing to dh_install.

274. By Julien Lavergne on 2010-12-13

Re-enable trunk r281:
 - Add a debug binary.
 - Call dh_strip for the dbg package.

275. By Julien Lavergne on 2010-12-13

Fixes for the dbg package.

276. By Julien Lavergne on 2010-12-17

Update copyright

277. By Julien Lavergne on 2010-12-17

* debian/synapse.1
 - Add manpages.

278. By Julien Lavergne on 2010-12-17

* debian/synapse.manpages:
 - Install the manpage.

279. By Julien Lavergne on 2010-12-17

Merge upstream.

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-07 20:20:43 +0000
+++ debian/changelog	2010-12-04 13:34:30 +0000
@@ -1,5 +1,24 @@
-synapse (0+bzr20101107-1) experimental; urgency=low
+synapse (0.2.0+bzr-2) UNRELEASED; urgency=low
+
+  * debian/control:
+   - Set zeitgeist and zeitgeist-fts-extension as Recommends.
+   - Bump libgtk2.0-dev, libglib2.0-dev and intltool requierement.
+   - Update Vcs-*.
+   - Build-depends on pkg-config.
+   - Build-depends on libappindicator-dev.
+  * debian/docs:
+   - Add upstream documentation.
+  * debian/watch
+   - Add a watch file.
+  * debian/copyright
+   - Update copyright holders.
+  * debian/rules:
+   - Pass --enable-indicator=auto to configure.
+
+ -- Julien Lavergne <[e-mail]>  Tue, 30 Nov 2010 21:55:53 +0100
+
+synapse (0.2.0+bzr-1) experimental; urgency=low
 
   * Initial release.
 
- -- Siegfried-Angel Gevatter Pujals <[e-mail]>  Fri, 10 Sep 2010 14:31:29 +0200
+ -- Michal Hruby <[e-mail]>  Fri, 10 Sep 2010 14:31:29 +0200

=== modified file 'debian/control'
--- debian/control	2010-12-01 12:25:25 +0000
+++ debian/control	2010-12-04 13:34:30 +0000
@@ -1,29 +1,34 @@
 Source: synapse
 Section: utils
 Priority: optional
-Maintainer: Siegfried-Angel Gevatter Pujals <[e-mail]>
+Maintainer: Michal Hruby <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~),
- intltool,
+ intltool (>= 0.35),
+ pkg-config,
  valac (>= 0.9.7~),
  libzeitgeist-dev,
  libdbus-glib-1-dev,
- libgtk2.0-dev,
+ libgtk2.0-dev (>= 2.20.0),
+ libglib2.0-dev (>= 2.22.0),
  libgee-dev (>= 0.5.2),
  libjson-glib-dev (>= 0.10.0),
  libunique-dev,
- libgtkhotkey-dev
-Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~zeitgeist-packagers/sezen/debian-sezen2
-Vcs-Browser: https://code.launchpad.net/~zeitgeist-packagers/sezen/debian-sezen2
+ libgtkhotkey-dev,
+ libappindicator-dev (>= 0.0.7)
+Vcs-Bzr: http://bazaar.launchpad.net/~synapse-core/synapse-project/trunk/
+Vcs-Browser: http://bazaar.launchpad.net/~synapse-core/synapse-project/trunk/files
 Homepage: https://launchpad.net/synapse-project
 Standards-Version: 3.9.1
 
 Package: synapse
 Architecture: any
 Depends: ${shlibs:Depends},
- ${misc:Depends},
- zeitgeist (>= 0.5.0~) | zeitgeist-core (>= 0.5.0~),
- libjson-glib-1.0-0 (>= 0.10.0),
- libgee2 (>= 0.5.2)
+         ${misc:Depends},
+#Hard-code version for Lucid, ${shlibs:Depends} doesn't work for libs in the PPA
+         libjson-glib-1.0-0 (>= 0.10.0),	
+         libgee2 (>= 0.5.2)
+Recommends: zeitgeist (>= 0.5.0~) | zeitgeist-core (>= 0.5.0~),
+            zeitgeist-fts-extension
 Description: semantic file launcher
  Synapse is a graphical launcher enabling you to start applications and also
  to quickly find and access relevant documents and files (by making use of the

=== modified file 'debian/copyright'
--- debian/copyright	2010-11-07 20:20:43 +0000
+++ debian/copyright	2010-12-04 13:34:30 +0000
@@ -1,15 +1,33 @@
-Format-Specification: http://dep.debian.net/deps/dep5/#index4h1
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
 Name: Synapse
 Maintainer: Michal Hruby <[e-mail]>
-Source: https://code.launchpad.net/sezen
+Source: https://code.launchpad.net/synapse-project
 
 Files: *
-Copyright: © 2010, Michal Hruby <[e-mail]>
+Copyright:
+ 2010, Michal Hruby <[e-mail]>,
+ 2006-2007-2008-2009 Andrea Cimitan
 License: GPL-2+
 
 Files: debian/*
-Copyright: © 2010, Siegfried-Angel Gevatter Pujals <[e-mail]>
-License: GPL-2+
-
-License: GPL-2+
- See `/usr/share/common-licenses/GPL'.
+Copyright: 
+ 2010, Michal Hruby <[e-mail]>,
+ 2010, Julien Lavergne <[e-mail]>
+License: GPL-2+
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+X-Comment: On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2’.

=== added file 'debian/docs'
--- debian/docs	1970-01-01 00:00:00 +0000
+++ debian/docs	2010-12-04 13:34:30 +0000
@@ -0,0 +1,4 @@
+AUTHORS
+ChangeLog
+NEWS
+README

=== modified file 'debian/rules'
--- debian/rules	2010-11-07 21:23:15 +0000
+++ debian/rules	2010-12-04 13:34:30 +0000
@@ -5,5 +5,5 @@
 
 override_dh_auto_configure:
 	./autogen.sh
-	dh_auto_configure
+	dh_auto_configure -- --enable-indicator=auto
 

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2010-12-04 13:34:30 +0000
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/synapse-project/+download http://launchpad.net/synapse-project/.*/synapse-(.+)\.tar.gz