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
=== modified file 'debian/changelog'
--- debian/changelog 2010-12-13 17:47:55 +0000
+++ debian/changelog 2010-12-17 21:19:46 +0000
@@ -6,6 +6,7 @@
6 - Update Vcs-*.6 - Update Vcs-*.
7 - Build-depends on pkg-config.7 - Build-depends on pkg-config.
8 - Build-depends on libappindicator-dev.8 - Build-depends on libappindicator-dev.
9 - Add a debug binary.
9 * debian/docs:10 * debian/docs:
10 - Add upstream documentation.11 - Add upstream documentation.
11 * debian/watch12 * debian/watch
@@ -14,6 +15,14 @@
14 - Update copyright holders and licenses.15 - Update copyright holders and licenses.
15 * debian/rules:16 * debian/rules:
16 - Pass --enable-indicator=auto to configure.17 - Pass --enable-indicator=auto to configure.
18 - Pass --fail-missing to dh_install.
19 - Call dh_strip for the dbg package.
20 * debian/synapse.install:
21 - Install all files in synapse binary.
22 * debian/synapse.1
23 - Add manpages.
24 * debian/synapse.manpages:
25 - Install the manpage.
1726
18 -- Julien Lavergne <gilir@ubuntu.com> Tue, 30 Nov 2010 21:55:53 +010027 -- Julien Lavergne <gilir@ubuntu.com> Tue, 30 Nov 2010 21:55:53 +0100
1928
2029
=== modified file 'debian/control'
--- debian/control 2010-12-13 17:47:55 +0000
+++ debian/control 2010-12-17 21:19:46 +0000
@@ -36,3 +36,17 @@
36 Synapse is a graphical launcher enabling you to start applications and also36 Synapse is a graphical launcher enabling you to start applications and also
37 to quickly find and access relevant documents and files (by making use of the37 to quickly find and access relevant documents and files (by making use of the
38 Zeitgeist engine).38 Zeitgeist engine).
39
40Package: synapse-dbg
41Architecture: any
42Section: debug
43Priority: extra
44Depends: synapse (= ${binary:Version}),
45 ${shlibs:Depends},
46 ${misc:Depends}
47Description: semantic file launcher - debug package
48 Synapse is a graphical launcher enabling you to start applications and also
49 to quickly find and access relevant documents and files (by making use of the
50 Zeitgeist engine).
51 .
52 This package contains the debug symbols.
3953
=== modified file 'debian/copyright'
--- debian/copyright 2010-12-05 14:37:45 +0000
+++ debian/copyright 2010-12-17 21:19:46 +0000
@@ -6,7 +6,8 @@
6Files: *6Files: *
7Copyright:7Copyright:
8 2010, Michal Hruby <michal.mhr@gmail.com>,8 2010, Michal Hruby <michal.mhr@gmail.com>,
9 2006-2007-2008-2009 Andrea Cimitan9 2006-2007-2008-2009 Andrea Cimitan,
10 2010 Alberto Aldegheri <albyrock87+dev@gmail.com>
10License: GPL-3+11License: GPL-3+
1112
12Files: src/core/*13Files: src/core/*
@@ -14,16 +15,12 @@
14 2010, Michal Hruby <michal.mhr@gmail.com>,15 2010, Michal Hruby <michal.mhr@gmail.com>,
15License: LGPL-2.1+16License: LGPL-2.1+
1617
17Files: src/plugins18Files: src/plugins/*
18 src/ui-cmd-line.vala19 src/tile-view/*
19 src/ui-basic-gtk.vala
20 src/tile-view/wrap-label.vala
21 src/tile-view/abstract-tile-object.vala
22 src/tile-view/tile.vala
23 src/tile-view/tile-view.vala
24Copyright:20Copyright:
25 2010, Michal Hruby <michal.mhr@gmail.com>,21 2010, Michal Hruby <michal.mhr@gmail.com>,
26 2010, Igor S. Mandrigin <i@mandrigin.ru>22 2010, Igor S. Mandrigin <i@mandrigin.ru>,
23 2010 Alberto Aldegheri <albyrock87+dev@gmail.com>
27License: GPL-2+24License: GPL-2+
2825
29Files: debian/*26Files: debian/*
@@ -80,3 +77,4 @@
80 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.77 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
81X-Comment: On Debian systems, the complete text of the GNU General78X-Comment: On Debian systems, the complete text of the GNU General
82 Public License can be found in `/usr/share/common-licenses/GPL-2’.79 Public License can be found in `/usr/share/common-licenses/GPL-2’.
80
8381
=== modified file 'debian/rules'
--- debian/rules 2010-12-13 17:47:55 +0000
+++ debian/rules 2010-12-17 21:19:46 +0000
@@ -7,3 +7,9 @@
7 ./autogen.sh7 ./autogen.sh
8 dh_auto_configure -- --enable-indicator=auto8 dh_auto_configure -- --enable-indicator=auto
99
10override_dh_install:
11 dh_install --fail-missing
12
13override_dh_strip:
14 dh_strip --dbg-package=synapse-dbg
15
1016
=== added file 'debian/synapse.1'
--- debian/synapse.1 1970-01-01 00:00:00 +0000
+++ debian/synapse.1 2010-12-17 21:19:46 +0000
@@ -0,0 +1,23 @@
1.TH "synapse" 1
2.SH NAME
3synapse \- Utility to launch everything on your computer.
4.SH SYNOPSIS
5.B synapse
6[OPTIONS]
7
8.SH DESCRIPTION
9
10Synapse is an utility to launch everything you have on your computer. It uses
11zeitgiest to search into the user's activity.
12
13.SH OPTIONS
14.TP
15.B \-s, \-\-startup=
16Startup mode (hide the UI until activated).
17
18.SH AUTHORS
19Michal Hruby <michal.mhr@gmail.com>
20
21Alberto Aldegheri <albyrock87+dev@gmail.com>
22
23Man page written to conform with Debian by Julien Lavergne.
024
=== added file 'debian/synapse.install'
--- debian/synapse.install 1970-01-01 00:00:00 +0000
+++ debian/synapse.install 2010-12-17 21:19:46 +0000
@@ -0,0 +1,1 @@
1usr/
02
=== added file 'debian/synapse.manpages'
--- debian/synapse.manpages 1970-01-01 00:00:00 +0000
+++ debian/synapse.manpages 2010-12-17 21:19:46 +0000
@@ -0,0 +1,1 @@
1debian/synapse.1