Unity Videos Lens

Merge lp:~mterry/unity-lens-video/vala-rewrite-packaging into lp:~stolowski/unity-lens-video/vala-rewrite

  1. vala-rewrite-packaging
  2. Merge into vala-rewrite
Proposed by Michael Terry
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 156
Merged at revision: 155
Proposed branch: lp:~mterry/unity-lens-video/vala-rewrite-packaging
Merge into: lp:~stolowski/unity-lens-video/vala-rewrite
Diff against target: 200 lines (+55/-29)
12 files modified
configure.ac (+1/-1)
data/Makefile.am (+1/-1)
data/unity-lens-video.service.in (+1/-1)
data/unity-scope-video-remote.service.in (+1/-1)
debian/changelog (+4/-0)
debian/control (+26/-13)
debian/copyright (+6/-8)
debian/rules (+7/-2)
debian/unity-lens-video.install (+3/-0)
debian/unity-scope-video-remote.install (+3/-0)
debian/watch (+1/-1)
src/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~mterry/unity-lens-video/vala-rewrite-packaging
Reviewer Review Type Date Requested Status
Paweł Stołowski Approve
Review via email: mp+149020@code.launchpad.net

Description of the change

-Update packaging to take the Vala rewrite into consideration.
-Adds packaging for the remote scope
-Switches from libexecdir to pkglibexecdir
-Fix some leftover instances of "lens-videos" instead of "lens-video"

To post a comment you must log in.
lp:~mterry/unity-lens-video/vala-rewrite-packaging updated
156. By Michael Terry

update changelog

Revision history for this message
Paweł Stołowski (stolowski) wrote :

Looks good! I've built it with pbuilder and installed in latest raring with no problems. Thank you!

review: Approve
Revision history for this message
Michael Terry (mterry) wrote :

I guess you'll have to manually merge this into yours?

Revision history for this message
Paweł Stołowski (stolowski) wrote :

On 02/19/2013 12:28 PM, Michael Terry wrote:
> I guess you'll have to manually merge this into yours?
 Yes, just did this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2012-11-27 16:34:26 +0000
+++ configure.ac 2013-02-18 11:25:33 +0000
@@ -1,4 +1,4 @@
1AC_INIT(unity-lens-videos, 6.8.0, https://launchpad.net/unity-lens-videos)1AC_INIT(unity-lens-video, 6.8.0, https://launchpad.net/unity-lens-video)
2AC_COPYRIGHT([Copyright 2012 Canonical])2AC_COPYRIGHT([Copyright 2012 Canonical])
33
4AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)4AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
55
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2012-11-22 16:20:45 +0000
+++ data/Makefile.am 2013-02-18 11:25:33 +0000
@@ -7,7 +7,7 @@
7dbus_services_DATA = $(service_in_files:.service.in=.service)7dbus_services_DATA = $(service_in_files:.service.in=.service)
88
9%.service: %.service.in9%.service: %.service.in
10 $(AM_V_GEN)sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@10 $(AM_V_GEN)sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
1111
12lens_in_files = video.lens.in video-remote.scope12lens_in_files = video.lens.in video-remote.scope
13lensdir = $(LENSESDIR)/video13lensdir = $(LENSESDIR)/video
1414
=== modified file 'data/unity-lens-video.service.in'
--- data/unity-lens-video.service.in 2012-11-22 14:41:31 +0000
+++ data/unity-lens-video.service.in 2013-02-18 11:25:33 +0000
@@ -1,3 +1,3 @@
1[D-BUS Service]1[D-BUS Service]
2Name=net.launchpad.lens.video2Name=net.launchpad.lens.video
3Exec=@libexecdir@/unity-video-lens-daemon3Exec=@pkglibexecdir@/unity-video-lens-daemon
44
=== modified file 'data/unity-scope-video-remote.service.in'
--- data/unity-scope-video-remote.service.in 2012-11-22 12:23:14 +0000
+++ data/unity-scope-video-remote.service.in 2013-02-18 11:25:33 +0000
@@ -1,3 +1,3 @@
1[D-BUS Service]1[D-BUS Service]
2Name=net.launchpad.scope.RemoteVideos2Name=net.launchpad.scope.RemoteVideos
3Exec=@libexecdir@/unity-scope-video-remote3Exec=@pkglibexecdir@/unity-scope-video-remote
44
=== modified file 'debian/changelog'
--- debian/changelog 2012-11-15 17:09:41 +0000
+++ debian/changelog 2013-02-18 11:25:33 +0000
@@ -3,8 +3,12 @@
3 * debian/control:3 * debian/control:
4 - Update Bzr-Vcs4 - Update Bzr-Vcs
5 - Bump required debhelper to 95 - Bump required debhelper to 9
6 - Update Build-Depends for Vala rewrite
7 - Add unity-scope-video-remote to this source package
6 * debian/rules:8 * debian/rules:
7 - Use --fail-missing9 - Use --fail-missing
10 - Use dh-autoreconf
11 - Enable xvfb tests
8 * Automatic snapshot from revision 102 (bootstrap)12 * Automatic snapshot from revision 102 (bootstrap)
913
10 -- Michael Terry <mterry@ubuntu.com> Mon, 05 Nov 2012 14:08:07 -050014 -- Michael Terry <mterry@ubuntu.com> Mon, 05 Nov 2012 14:08:07 -0500
1115
=== modified file 'debian/control'
--- debian/control 2012-11-08 04:06:55 +0000
+++ debian/control 2013-02-18 11:25:33 +0000
@@ -2,28 +2,41 @@
2Section: gnome2Section: gnome
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: David Calle <davidc@framli.eu>5Build-Depends: debhelper (>= 9),
6Build-Depends: debhelper (>= 9), 6 dh-autoreconf,
7 python,
8 python-distutils-extra,
9 dh-translations,7 dh-translations,
10Standards-Version: 3.9.38 gnome-common,
11Homepage: https://launchpad.net/unity-lens-videos9 libdee-dev (>= 1.0.7),
10 libgee-dev,
11 libglib2.0-dev (>= 2.27),
12 libjson-glib-dev,
13 libsoup-gnome2.4-dev,
14 libunity-dev (>= 6.90.2),
15 libzeitgeist-dev (>= 0.3.8),
16 valac-0.18,
17 xvfb,
18Standards-Version: 3.9.4
19Homepage: https://launchpad.net/unity-lens-video
12# If you aren't a member of ~unity-team but need to upload packaging changes,20# If you aren't a member of ~unity-team but need to upload packaging changes,
13# just go ahead. ~unity-team will notice and sync up the code again.21# just go ahead. ~unity-team will notice and sync up the code again.
14Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-videos/trunk22Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-video/trunk
1523
16Package: unity-lens-video24Package: unity-lens-video
17Architecture: all25Architecture: any
18Depends: ${misc:Depends},26Depends: ${misc:Depends},
19 ${python:Depends},27 ${shlibs:Depends},
20 gir1.2-unity-5.0,
21 gir1.2-dee-1.0,
22 gir1.2-glib-2.0,
23 python-zeitgeist,
24 unity-lens-music (>= 6.6.0),28 unity-lens-music (>= 6.6.0),
25Recommends: unity-scope-video-remote29Recommends: unity-scope-video-remote
26Breaks: unity (<< 6.0.0),30Breaks: unity (<< 6.0.0),
27Description: Unity Video lens31Description: Unity Video lens
28 A plugin to search videos in the Dash.32 A plugin to search videos in the Dash.
2933
34Package: unity-scope-video-remote
35Architecture: any
36Depends: ${misc:Depends},
37 ${shlibs:Depends},
38 gvfs-bin,
39 unity-lens-video,
40Enhances: unity-lens-video
41Description: Remote videos engine
42 This scope adds a remote videos search engine to the Video lens.
3043
=== modified file 'debian/copyright'
--- debian/copyright 2012-02-14 14:21:28 +0000
+++ debian/copyright 2013-02-18 11:25:33 +0000
@@ -1,15 +1,13 @@
1Format: http://dep.debian.net/deps/dep51Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Source: https://launchpad.net/unity-lens-videos2Source: https://launchpad.net/unity-lens-video
3Upstream-Name: unity-lens-video3Upstream-Name: Unity Video Lens
4Upstream-Contact: David Calle <davidc@framli.eu>
54
6Files: *5Files: *
7Copyright: 2011 David Calle <davidc@framli.eu>6Copyright: 2011-2013 Canonical Ltd
8License: GPL-3.0+7License: GPL-3
9 This program is free software: you can redistribute it and/or modify8 This program is free software: you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by9 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation, either version 3 of the License, or10 the Free Software Foundation, version 3 of the License.
12 (at your option) any later version.
13 .11 .
14 This program is distributed in the hope that it will be useful,12 This program is distributed in the hope that it will be useful,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of13 but WITHOUT ANY WARRANTY; without even the implied warranty of
1614
=== modified file 'debian/rules'
--- debian/rules 2012-11-08 04:06:55 +0000
+++ debian/rules 2013-02-18 11:25:33 +0000
@@ -1,9 +1,14 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2# -*- makefile -*-2# -*- makefile -*-
33
4
5%:4%:
6 dh $@ --with python2,translations5 dh $@ --with autoreconf,translations
6
7override_dh_autoreconf:
8 NOCONFIGURE=1 dh_autoreconf ./autogen.sh
9
10override_dh_auto_configure:
11 dh_auto_configure -- --enable-headless-tests
712
8override_dh_install:13override_dh_install:
9 dh_install --fail-missing14 dh_install --fail-missing
1015
=== added file 'debian/unity-lens-video.install'
--- debian/unity-lens-video.install 1970-01-01 00:00:00 +0000
+++ debian/unity-lens-video.install 2013-02-18 11:25:33 +0000
@@ -0,0 +1,3 @@
1/usr/lib/*/unity-lens-video/unity-video-lens-daemon
2/usr/share/dbus-1/services/unity-lens-video.service
3/usr/share/unity/lenses/video/video.lens
04
=== added file 'debian/unity-scope-video-remote.install'
--- debian/unity-scope-video-remote.install 1970-01-01 00:00:00 +0000
+++ debian/unity-scope-video-remote.install 2013-02-18 11:25:33 +0000
@@ -0,0 +1,3 @@
1/usr/lib/*/unity-lens-video/unity-scope-video-remote
2/usr/share/dbus-1/services/unity-scope-video-remote.service
3/usr/share/unity/lenses/video/video-remote.scope
04
=== modified file 'debian/watch'
--- debian/watch 2012-03-21 21:41:31 +0000
+++ debian/watch 2013-02-18 11:25:33 +0000
@@ -1,2 +1,2 @@
1version=31version=3
2http://launchpad.net/unity-lens-videos/+download .*/unity-lens-video-([0-9.]+)\.tar\.gz2http://launchpad.net/unity-lens-video/+download .*/unity-lens-video-([0-9.]+)\.tar\.gz
33
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2012-11-19 11:00:54 +0000
+++ src/Makefile.am 2013-02-18 11:25:33 +0000
@@ -5,7 +5,7 @@
55
6DATADIR = $(datadir)6DATADIR = $(datadir)
77
8libexec_PROGRAMS = \8pkglibexec_PROGRAMS = \
9 unity-video-lens-daemon \9 unity-video-lens-daemon \
10 unity-scope-video-remote \10 unity-scope-video-remote \
11 $(NULL)11 $(NULL)

Subscribers

People subscribed via source and target branches