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

Proposed by Julien Lavergne
Status: Merged
Merged at revision: 322
Proposed branch: lp:~gilir/synapse-project/packaging
Merge into: lp:synapse-project
Diff against target: 142 lines (+61/-9)
7 files modified
debian/changelog (+9/-0)
debian/control (+14/-0)
debian/copyright (+7/-9)
debian/rules (+6/-0)
debian/synapse.1 (+23/-0)
debian/synapse.install (+1/-0)
debian/synapse.manpages (+1/-0)
To merge this branch: bzr merge lp:~gilir/synapse-project/packaging
Reviewer Review Type Date Requested Status
Synapse core team Pending
Review via email: mp+43573@code.launchpad.net
To post a comment you must log in.
lp:~gilir/synapse-project/packaging updated
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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-12-13 17:47:55 +0000
3+++ debian/changelog 2010-12-17 21:19:46 +0000
4@@ -6,6 +6,7 @@
5 - Update Vcs-*.
6 - Build-depends on pkg-config.
7 - Build-depends on libappindicator-dev.
8+ - Add a debug binary.
9 * debian/docs:
10 - Add upstream documentation.
11 * debian/watch
12@@ -14,6 +15,14 @@
13 - Update copyright holders and licenses.
14 * debian/rules:
15 - Pass --enable-indicator=auto to configure.
16+ - Pass --fail-missing to dh_install.
17+ - Call dh_strip for the dbg package.
18+ * debian/synapse.install:
19+ - Install all files in synapse binary.
20+ * debian/synapse.1
21+ - Add manpages.
22+ * debian/synapse.manpages:
23+ - Install the manpage.
24
25 -- Julien Lavergne <gilir@ubuntu.com> Tue, 30 Nov 2010 21:55:53 +0100
26
27
28=== modified file 'debian/control'
29--- debian/control 2010-12-13 17:47:55 +0000
30+++ debian/control 2010-12-17 21:19:46 +0000
31@@ -36,3 +36,17 @@
32 Synapse is a graphical launcher enabling you to start applications and also
33 to quickly find and access relevant documents and files (by making use of the
34 Zeitgeist engine).
35+
36+Package: synapse-dbg
37+Architecture: any
38+Section: debug
39+Priority: extra
40+Depends: synapse (= ${binary:Version}),
41+ ${shlibs:Depends},
42+ ${misc:Depends}
43+Description: semantic file launcher - debug package
44+ Synapse is a graphical launcher enabling you to start applications and also
45+ to quickly find and access relevant documents and files (by making use of the
46+ Zeitgeist engine).
47+ .
48+ This package contains the debug symbols.
49
50=== modified file 'debian/copyright'
51--- debian/copyright 2010-12-05 14:37:45 +0000
52+++ debian/copyright 2010-12-17 21:19:46 +0000
53@@ -6,7 +6,8 @@
54 Files: *
55 Copyright:
56 2010, Michal Hruby <michal.mhr@gmail.com>,
57- 2006-2007-2008-2009 Andrea Cimitan
58+ 2006-2007-2008-2009 Andrea Cimitan,
59+ 2010 Alberto Aldegheri <albyrock87+dev@gmail.com>
60 License: GPL-3+
61
62 Files: src/core/*
63@@ -14,16 +15,12 @@
64 2010, Michal Hruby <michal.mhr@gmail.com>,
65 License: LGPL-2.1+
66
67-Files: src/plugins
68- src/ui-cmd-line.vala
69- src/ui-basic-gtk.vala
70- src/tile-view/wrap-label.vala
71- src/tile-view/abstract-tile-object.vala
72- src/tile-view/tile.vala
73- src/tile-view/tile-view.vala
74+Files: src/plugins/*
75+ src/tile-view/*
76 Copyright:
77 2010, Michal Hruby <michal.mhr@gmail.com>,
78- 2010, Igor S. Mandrigin <i@mandrigin.ru>
79+ 2010, Igor S. Mandrigin <i@mandrigin.ru>,
80+ 2010 Alberto Aldegheri <albyrock87+dev@gmail.com>
81 License: GPL-2+
82
83 Files: debian/*
84@@ -80,3 +77,4 @@
85 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
86 X-Comment: On Debian systems, the complete text of the GNU General
87 Public License can be found in `/usr/share/common-licenses/GPL-2’.
88+
89
90=== modified file 'debian/rules'
91--- debian/rules 2010-12-13 17:47:55 +0000
92+++ debian/rules 2010-12-17 21:19:46 +0000
93@@ -7,3 +7,9 @@
94 ./autogen.sh
95 dh_auto_configure -- --enable-indicator=auto
96
97+override_dh_install:
98+ dh_install --fail-missing
99+
100+override_dh_strip:
101+ dh_strip --dbg-package=synapse-dbg
102+
103
104=== added file 'debian/synapse.1'
105--- debian/synapse.1 1970-01-01 00:00:00 +0000
106+++ debian/synapse.1 2010-12-17 21:19:46 +0000
107@@ -0,0 +1,23 @@
108+.TH "synapse" 1
109+.SH NAME
110+synapse \- Utility to launch everything on your computer.
111+.SH SYNOPSIS
112+.B synapse
113+[OPTIONS]
114+
115+.SH DESCRIPTION
116+
117+Synapse is an utility to launch everything you have on your computer. It uses
118+zeitgiest to search into the user's activity.
119+
120+.SH OPTIONS
121+.TP
122+.B \-s, \-\-startup=
123+Startup mode (hide the UI until activated).
124+
125+.SH AUTHORS
126+Michal Hruby <michal.mhr@gmail.com>
127+
128+Alberto Aldegheri <albyrock87+dev@gmail.com>
129+
130+Man page written to conform with Debian by Julien Lavergne.
131
132=== added file 'debian/synapse.install'
133--- debian/synapse.install 1970-01-01 00:00:00 +0000
134+++ debian/synapse.install 2010-12-17 21:19:46 +0000
135@@ -0,0 +1,1 @@
136+usr/
137
138=== added file 'debian/synapse.manpages'
139--- debian/synapse.manpages 1970-01-01 00:00:00 +0000
140+++ debian/synapse.manpages 2010-12-17 21:19:46 +0000
141@@ -0,0 +1,1 @@
142+debian/synapse.1