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

[Julien Lavergne (gilir)]

Re-merge with upstream.
Build-depends on libappindicator adding. Flag to configure set to --auto, so it should handle the case when libappindicator is too old.

[Michal Hruby (mhr3)]

@gilir: I committed proper licenses to the files, could you update the branch please?

review: Needs Fixing

[Julien Lavergne (gilir)]

The commit said : Use proper licenses - LGPL2.1+ for core, GPL3 for UI

But the output of licensecheck is quite different :

src/synapse-main.vala: LGPL (v3 or later)
src/ui-cmd-line.vala: GPL (v2 or later)
src/ui-basic-gtk.vala: GPL (v2 or later)
src/tile-view/wrap-label.vala: GPL (v2 or later)
src/tile-view/abstract-tile-object.vala: GPL (v2 or later)
src/tile-view/tile.vala: GPL (v2 or later)
src/tile-view/tile-view.vala: GPL (v2 or later)
src/plugins/locate-plugin.vala: GPL (v2 or later)
src/plugins/desktop-file-plugin.vala: GPL (v2 or later)
src/plugins/gnome-session-plugin.vala: GPL (v2 or later)
src/plugins/test-slow-plugin.vala: GPL (v2 or later)
src/plugins/command-plugin.vala: GPL (v2 or later)
src/plugins/upower-plugin.vala: GPL (v2 or later)
src/plugins/rhythmbox-plugin.vala: GPL (v2 or later)
src/plugins/zeitgeist-plugin.vala: GPL (v2 or later)
src/plugins/devhelp-search.vala: GPL (v2 or later)
src/plugins/directory-plugin.vala: GPL (v2 or later)
src/plugins/hybrid-search-plugin.vala: GPL (v2 or later)
src/plugins/dictionary.vala: GPL (v2 or later)
src/plugins/gnome-screensaver-plugin.vala: GPL (v2 or later)
src/plugins/banshee-plugin.vala: GPL (v2 or later)
src/ui-cairo-gtk-virgilio.vala: LGPL (v3 or later)
src/core/data-sink.vala: LGPL (v2.1 or later)
src/core/result-set.vala: LGPL (v2.1 or later)
src/core/query.vala: LGPL (v2.1 or later)
src/core/match.vala: LGPL (v2.1 or later)
src/core/config-service.vala: LGPL (v2 or later)
src/core/dbus-service.vala: LGPL (v2.1 or later)
src/core/plugin.vala: LGPL (v2.1 or later)
src/core/utils.vala: LGPL (v2.1 or later)
src/core/common-actions.vala: LGPL (v2.1 or later)
src/core/desktop-file-service.vala: LGPL (v2.1 or later)
src/ui-widgets.vala: LGPL (v3 or later)
src/ui-settings.vala: LGPL (v3 or later)
src/ui-cairo-gtk-mini.vala: LGPL (v3 or later)
src/ui-cairo-gtk-base.vala: LGPL (v3 or later)
src/ui-inspector.vala: LGPL (v3 or later)
src/ui-cairo-gtk-two-lines.vala: LGPL (v3 or later)
src/ui-cairo-gtk.vala: LGPL (v3 or later)
src/ui-interface.vala: LGPL (v3 or later)
src/ui-utils.vala: LGPL (v3 or later)

[Michal Hruby (mhr3)]

Wow... I'm really unable to copy paste properly, I'll fix it in asap.

[Michal Hruby (mhr3)]

Should be good now. I hope...

[Julien Lavergne (gilir)]

debian/copyright updated.

[Michal Hruby (mhr3)]

Looks good.

review: Approve

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

229. By Michal Hruby on 2010-12-05

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

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-07 20:20:43 +0000
+++ debian/changelog	2010-12-05 14:40:09 +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 and licenses.
+  * 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-05 14:40:09 +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-05 14:40:09 +0000
@@ -1,15 +1,82 @@
-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-3+
+
+Files: src/core/*
+Copyright:
+ 2010, Michal Hruby <[e-mail]>,
+License: LGPL-2.1+
+
+Files: src/plugins
+       src/ui-cmd-line.vala
+       src/ui-basic-gtk.vala
+       src/tile-view/wrap-label.vala
+       src/tile-view/abstract-tile-object.vala
+       src/tile-view/tile.vala
+       src/tile-view/tile-view.vala
+Copyright:
+ 2010, Michal Hruby <[e-mail]>,
+ 2010, Igor S. Mandrigin <[e-mail]>
 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-3+
+
+License: GPL-3+
+  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 3 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, see <http://www.gnu.org/licenses/>.
+X-Comment: On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-3’.
+ 
+License: LGPL-2.1+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+ 
+  This library 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
+  Lesser General Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+X-Comment: On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1’.
+
+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 St, 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-05 14:40:09 +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-05 14:40:09 +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-05 14:40:09 +0000
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/synapse-project/+download http://launchpad.net/synapse-project/.*/synapse-(.+)\.tar.gz