Merge lp:~gilir/synapse-project/packaging into lp:synapse-project
- packaging
- Merge into trunk
Status: | Superseded |
---|---|
Proposed branch: | lp:~gilir/synapse-project/packaging |
Merge into: | lp:synapse-project |
Diff against target: |
161 lines (+69/-22) 7 files modified
debian/changelog (+21/-2) debian/control (+15/-10) debian/copyright (+26/-8) debian/docs (+4/-0) debian/rules (+1/-1) debian/watch (+2/-0) po/POTFILES.in (+0/-1) |
To merge this branch: | bzr merge lp:~gilir/synapse-project/packaging |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michal Hruby | Needs Fixing | ||
Review via email: mp+42729@code.launchpad.net |
This proposal has been superseded by a proposal from 2010-12-04.
Commit message
Description of the change
- 220. By Alberto Aldegheri
-
Fixes to show/hide methods
- 221. By Michal Hruby
-
Add plugin for locking screen
- 222. By Michal Hruby
-
Merge (with a few changes) from lp:~and471/synapse-project/trivial-fixes
- 223. By Michal Hruby
-
Use proper licenses - LGPL2.1+ for core, GPL3 for UI
- 224. By Michal Hruby
-
Fix a few mistakes in last commit
- 225. By Michal Hruby
-
Make sure we recurse desktop file directories properly
- 226. By Alberto Aldegheri
-
menu consistency
- 227. By Michal Hruby
-
Add RelevancyService stub
- 228. By Michal Hruby
-
Right, we wanted to use GPL3 for the UI, not LGPL
- 229. By Michal Hruby
-
Merge from <lp:~gilir/synapse-project/packaging>
- 230. By Michal Hruby
-
Bump libzg depends
- 231. By Michal Hruby
-
Add build-depends on automake
- 232. By Michal Hruby
-
...and on libtool
- 233. By Michal Hruby
-
Fix typo
- 234. By Alberto Aldegheri
-
Use window type hint DOCK to steal the focus
- 235. By Alberto Aldegheri
-
Use type hint DIALOG to fix wrong behaviour with Mutter and always-on-top windows
- 236. By Alberto Aldegheri
-
Connect to window state event to make sure that keep above is still there.
- 237. By Michal Hruby
-
Let's support a little bit of relevancy
- 238. By Michal Hruby
-
Fix a bug
- 239. By Michal Hruby
-
Don't set pager and taskbar hint inside window-state-event handler
- 240. By Alberto Aldegheri
-
Fix to Banshee and Rhythmbox detection
- 241. By Michal Hruby
-
Add option to disable notification icon
- 242. By Michal Hruby
-
We don't wanna hear the C warnings
- 243. By Michal Hruby
-
Add ability to browse also recently launched applications
- 244. By Alberto Aldegheri
-
Mixed RTL/LTR fix
- 245. By Michal Hruby
-
Add ExtendedInfo interface
- 246. By Michal Hruby
-
Yey for committing non-working code
- 247. By Alberto Aldegheri
-
Extended info support on MatchRenderer - reorganized rendering
- 248. By Alberto Aldegheri
-
Added Comments in ui-interface.vala
- 249. By Alberto Aldegheri
-
Some comments added and my (C) on some files
- 250. By Alberto Aldegheri
-
Fix typo huge error in Rhythmbox Plugin
- 251. By Michal Hruby
-
Cleaning up...
- 252. By Alberto Aldegheri
-
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
-
Minor changes
- 254. By Alberto Aldegheri
-
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
-
Color adjustments, and now Synapse supports custom gtkrc, see line 32 in ui-cairo-
gtk-base. vala - 256. By Michal Hruby
-
Update translation template
- 257. By Alberto Aldegheri
-
Visual bugfix - MenuButton is not using its style.
- 258. By Alberto Aldegheri
-
Fix a bug in ListView
- 259. By Alberto Aldegheri
-
Fix to colors in dark themes
- 260. By Alberto Aldegheri
-
Added a sample gtkrc for Synapse custom style
- 261. By Alberto Aldegheri
-
Stupid me.
- 262. By Alberto Aldegheri
-
Nicer selection on ListView. Now the label fades the color.
- 263. By Alberto Aldegheri
-
UI visual fixes
- 264. By Alberto Aldegheri
-
In MatchRenderer Hilight title only when the row is fully selected (animation ended)
- 265. By Alberto Aldegheri
-
Stupid me. Fix compile errors
- 266. By Alberto Aldegheri
-
Stupid me. Fix compile errors
- 267. By Michal Hruby
-
Change relevancy computation.. again
- 268. By Michal Hruby
-
Change relevancy computation.. again
- 269. By Michal Hruby
-
Fix bug #685634
- 270. By Julien Lavergne
-
Call dh_strip for the dbg package.
- 271. By Julien Lavergne
-
Add a debug binary.
- 272. By Julien Lavergne
-
* debian/
synapse. install:
- Install all files in synapse binary. - 273. By Julien Lavergne
-
Pass --fail-missing to dh_install.
- 274. By Julien Lavergne
-
Re-enable trunk r281:
- Add a debug binary.
- Call dh_strip for the dbg package. - 275. By Julien Lavergne
-
Fixes for the dbg package.
- 276. By Julien Lavergne
-
Update copyright
- 277. By Julien Lavergne
-
* debian/synapse.1
- Add manpages. - 278. By Julien Lavergne
-
* debian/
synapse. manpages:
- Install the manpage. - 279. By Julien Lavergne
-
Merge upstream.
Unmerged revisions
Preview Diff
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2010-11-07 20:20:43 +0000 |
3 | +++ debian/changelog 2010-12-04 13:26:28 +0000 |
4 | @@ -1,5 +1,24 @@ |
5 | -synapse (0+bzr20101107-1) experimental; urgency=low |
6 | +synapse (0.2.0+bzr-2) UNRELEASED; urgency=low |
7 | + |
8 | + * debian/control: |
9 | + - Set zeitgeist and zeitgeist-fts-extension as Recommends. |
10 | + - Bump libgtk2.0-dev, libglib2.0-dev and intltool requierement. |
11 | + - Update Vcs-*. |
12 | + - Build-depends on pkg-config. |
13 | + - Build-depends on libappindicator-dev. |
14 | + * debian/docs: |
15 | + - Add upstream documentation. |
16 | + * debian/watch |
17 | + - Add a watch file. |
18 | + * debian/copyright |
19 | + - Update copyright holders. |
20 | + * debian/rules: |
21 | + - Pass --enable-indicator=auto to configure. |
22 | + |
23 | + -- Julien Lavergne <gilir@ubuntu.com> Tue, 30 Nov 2010 21:55:53 +0100 |
24 | + |
25 | +synapse (0.2.0+bzr-1) experimental; urgency=low |
26 | |
27 | * Initial release. |
28 | |
29 | - -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> Fri, 10 Sep 2010 14:31:29 +0200 |
30 | + -- Michal Hruby <michal.mhr@gmail.com> Fri, 10 Sep 2010 14:31:29 +0200 |
31 | |
32 | === modified file 'debian/control' |
33 | --- debian/control 2010-12-01 12:25:25 +0000 |
34 | +++ debian/control 2010-12-04 13:26:28 +0000 |
35 | @@ -1,29 +1,34 @@ |
36 | Source: synapse |
37 | Section: utils |
38 | Priority: optional |
39 | -Maintainer: Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> |
40 | +Maintainer: Michal Hruby <michal.mhr@gmail.com> |
41 | Build-Depends: debhelper (>= 7.0.50~), |
42 | - intltool, |
43 | + intltool (>= 0.35), |
44 | + pkg-config, |
45 | valac (>= 0.9.7~), |
46 | libzeitgeist-dev, |
47 | libdbus-glib-1-dev, |
48 | - libgtk2.0-dev, |
49 | + libgtk2.0-dev (>= 2.20.0), |
50 | + libglib2.0-dev (>= 2.22.0), |
51 | libgee-dev (>= 0.5.2), |
52 | libjson-glib-dev (>= 0.10.0), |
53 | libunique-dev, |
54 | - libgtkhotkey-dev |
55 | -Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~zeitgeist-packagers/sezen/debian-sezen2 |
56 | -Vcs-Browser: https://code.launchpad.net/~zeitgeist-packagers/sezen/debian-sezen2 |
57 | + libgtkhotkey-dev, |
58 | + libappindicator-dev (>= 0.0.7) |
59 | +Vcs-Bzr: http://bazaar.launchpad.net/~synapse-core/synapse-project/trunk/ |
60 | +Vcs-Browser: http://bazaar.launchpad.net/~synapse-core/synapse-project/trunk/files |
61 | Homepage: https://launchpad.net/synapse-project |
62 | Standards-Version: 3.9.1 |
63 | |
64 | Package: synapse |
65 | Architecture: any |
66 | Depends: ${shlibs:Depends}, |
67 | - ${misc:Depends}, |
68 | - zeitgeist (>= 0.5.0~) | zeitgeist-core (>= 0.5.0~), |
69 | - libjson-glib-1.0-0 (>= 0.10.0), |
70 | - libgee2 (>= 0.5.2) |
71 | + ${misc:Depends}, |
72 | +#Hard-code version for Lucid, ${shlibs:Depends} doesn't work for libs in the PPA |
73 | + libjson-glib-1.0-0 (>= 0.10.0), |
74 | + libgee2 (>= 0.5.2) |
75 | +Recommends: zeitgeist (>= 0.5.0~) | zeitgeist-core (>= 0.5.0~), |
76 | + zeitgeist-fts-extension |
77 | Description: semantic file launcher |
78 | Synapse is a graphical launcher enabling you to start applications and also |
79 | to quickly find and access relevant documents and files (by making use of the |
80 | |
81 | === modified file 'debian/copyright' |
82 | --- debian/copyright 2010-11-07 20:20:43 +0000 |
83 | +++ debian/copyright 2010-12-04 13:26:28 +0000 |
84 | @@ -1,15 +1,33 @@ |
85 | -Format-Specification: http://dep.debian.net/deps/dep5/#index4h1 |
86 | +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 |
87 | Name: Synapse |
88 | Maintainer: Michal Hruby <michal.mhr@gmail.com> |
89 | -Source: https://code.launchpad.net/sezen |
90 | +Source: https://code.launchpad.net/synapse-project |
91 | |
92 | Files: * |
93 | -Copyright: © 2010, Michal Hruby <michal.mhr@gmail.com> |
94 | +Copyright: |
95 | + 2010, Michal Hruby <michal.mhr@gmail.com>, |
96 | + 2006-2007-2008-2009 Andrea Cimitan |
97 | License: GPL-2+ |
98 | |
99 | Files: debian/* |
100 | -Copyright: © 2010, Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com> |
101 | -License: GPL-2+ |
102 | - |
103 | -License: GPL-2+ |
104 | - See `/usr/share/common-licenses/GPL'. |
105 | +Copyright: |
106 | + 2010, Michal Hruby <michal.mhr@gmail.com>, |
107 | + 2010, Julien Lavergne <gilir@ubuntu.com> |
108 | +License: GPL-2+ |
109 | + |
110 | +License: GPL-2+ |
111 | + This program is free software; you can redistribute it and/or modify |
112 | + it under the terms of the GNU General Public License as published by |
113 | + the Free Software Foundation; either version 2 of the License, or |
114 | + (at your option) any later version. |
115 | + |
116 | + This program is distributed in the hope that it will be useful, |
117 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
118 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
119 | + GNU General Public License for more details. |
120 | + |
121 | + You should have received a copy of the GNU General Public License along |
122 | + with this program; if not, write to the Free Software Foundation, Inc., |
123 | + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
124 | +X-Comment: On Debian systems, the complete text of the GNU General |
125 | + Public License can be found in `/usr/share/common-licenses/GPL-2’. |
126 | |
127 | === added file 'debian/docs' |
128 | --- debian/docs 1970-01-01 00:00:00 +0000 |
129 | +++ debian/docs 2010-12-04 13:26:28 +0000 |
130 | @@ -0,0 +1,4 @@ |
131 | +AUTHORS |
132 | +ChangeLog |
133 | +NEWS |
134 | +README |
135 | |
136 | === modified file 'debian/rules' |
137 | --- debian/rules 2010-11-07 21:23:15 +0000 |
138 | +++ debian/rules 2010-12-04 13:26:28 +0000 |
139 | @@ -5,5 +5,5 @@ |
140 | |
141 | override_dh_auto_configure: |
142 | ./autogen.sh |
143 | - dh_auto_configure |
144 | + dh_auto_configure -- --enable-indicator=auto |
145 | |
146 | |
147 | === added file 'debian/watch' |
148 | --- debian/watch 1970-01-01 00:00:00 +0000 |
149 | +++ debian/watch 2010-12-04 13:26:28 +0000 |
150 | @@ -0,0 +1,2 @@ |
151 | +version=3 |
152 | +https://launchpad.net/synapse-project/+download http://launchpad.net/synapse-project/.*/synapse-(.+)\.tar.gz |
153 | |
154 | === modified file 'po/POTFILES.in' |
155 | --- po/POTFILES.in 2010-12-02 11:01:08 +0000 |
156 | +++ po/POTFILES.in 2010-12-04 13:26:28 +0000 |
157 | @@ -17,4 +17,3 @@ |
158 | src/plugins/rhythmbox-plugin.c |
159 | src/plugins/upower-plugin.c |
160 | src/plugins/zeitgeist-plugin.c |
161 | - |
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?