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
1=== modified file 'configure.ac'
2--- configure.ac 2012-11-27 16:34:26 +0000
3+++ configure.ac 2013-02-18 11:25:33 +0000
4@@ -1,4 +1,4 @@
5-AC_INIT(unity-lens-videos, 6.8.0, https://launchpad.net/unity-lens-videos)
6+AC_INIT(unity-lens-video, 6.8.0, https://launchpad.net/unity-lens-video)
7 AC_COPYRIGHT([Copyright 2012 Canonical])
8
9 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
10
11=== modified file 'data/Makefile.am'
12--- data/Makefile.am 2012-11-22 16:20:45 +0000
13+++ data/Makefile.am 2013-02-18 11:25:33 +0000
14@@ -7,7 +7,7 @@
15 dbus_services_DATA = $(service_in_files:.service.in=.service)
16
17 %.service: %.service.in
18- $(AM_V_GEN)sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
19+ $(AM_V_GEN)sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
20
21 lens_in_files = video.lens.in video-remote.scope
22 lensdir = $(LENSESDIR)/video
23
24=== modified file 'data/unity-lens-video.service.in'
25--- data/unity-lens-video.service.in 2012-11-22 14:41:31 +0000
26+++ data/unity-lens-video.service.in 2013-02-18 11:25:33 +0000
27@@ -1,3 +1,3 @@
28 [D-BUS Service]
29 Name=net.launchpad.lens.video
30-Exec=@libexecdir@/unity-video-lens-daemon
31+Exec=@pkglibexecdir@/unity-video-lens-daemon
32
33=== modified file 'data/unity-scope-video-remote.service.in'
34--- data/unity-scope-video-remote.service.in 2012-11-22 12:23:14 +0000
35+++ data/unity-scope-video-remote.service.in 2013-02-18 11:25:33 +0000
36@@ -1,3 +1,3 @@
37 [D-BUS Service]
38 Name=net.launchpad.scope.RemoteVideos
39-Exec=@libexecdir@/unity-scope-video-remote
40+Exec=@pkglibexecdir@/unity-scope-video-remote
41
42=== modified file 'debian/changelog'
43--- debian/changelog 2012-11-15 17:09:41 +0000
44+++ debian/changelog 2013-02-18 11:25:33 +0000
45@@ -3,8 +3,12 @@
46 * debian/control:
47 - Update Bzr-Vcs
48 - Bump required debhelper to 9
49+ - Update Build-Depends for Vala rewrite
50+ - Add unity-scope-video-remote to this source package
51 * debian/rules:
52 - Use --fail-missing
53+ - Use dh-autoreconf
54+ - Enable xvfb tests
55 * Automatic snapshot from revision 102 (bootstrap)
56
57 -- Michael Terry <mterry@ubuntu.com> Mon, 05 Nov 2012 14:08:07 -0500
58
59=== modified file 'debian/control'
60--- debian/control 2012-11-08 04:06:55 +0000
61+++ debian/control 2013-02-18 11:25:33 +0000
62@@ -2,28 +2,41 @@
63 Section: gnome
64 Priority: optional
65 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
66-XSBC-Original-Maintainer: David Calle <davidc@framli.eu>
67-Build-Depends: debhelper (>= 9),
68- python,
69- python-distutils-extra,
70+Build-Depends: debhelper (>= 9),
71+ dh-autoreconf,
72 dh-translations,
73-Standards-Version: 3.9.3
74-Homepage: https://launchpad.net/unity-lens-videos
75+ gnome-common,
76+ libdee-dev (>= 1.0.7),
77+ libgee-dev,
78+ libglib2.0-dev (>= 2.27),
79+ libjson-glib-dev,
80+ libsoup-gnome2.4-dev,
81+ libunity-dev (>= 6.90.2),
82+ libzeitgeist-dev (>= 0.3.8),
83+ valac-0.18,
84+ xvfb,
85+Standards-Version: 3.9.4
86+Homepage: https://launchpad.net/unity-lens-video
87 # If you aren't a member of ~unity-team but need to upload packaging changes,
88 # just go ahead. ~unity-team will notice and sync up the code again.
89-Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-videos/trunk
90+Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-video/trunk
91
92 Package: unity-lens-video
93-Architecture: all
94+Architecture: any
95 Depends: ${misc:Depends},
96- ${python:Depends},
97- gir1.2-unity-5.0,
98- gir1.2-dee-1.0,
99- gir1.2-glib-2.0,
100- python-zeitgeist,
101+ ${shlibs:Depends},
102 unity-lens-music (>= 6.6.0),
103 Recommends: unity-scope-video-remote
104 Breaks: unity (<< 6.0.0),
105 Description: Unity Video lens
106 A plugin to search videos in the Dash.
107
108+Package: unity-scope-video-remote
109+Architecture: any
110+Depends: ${misc:Depends},
111+ ${shlibs:Depends},
112+ gvfs-bin,
113+ unity-lens-video,
114+Enhances: unity-lens-video
115+Description: Remote videos engine
116+ This scope adds a remote videos search engine to the Video lens.
117
118=== modified file 'debian/copyright'
119--- debian/copyright 2012-02-14 14:21:28 +0000
120+++ debian/copyright 2013-02-18 11:25:33 +0000
121@@ -1,15 +1,13 @@
122-Format: http://dep.debian.net/deps/dep5
123-Source: https://launchpad.net/unity-lens-videos
124-Upstream-Name: unity-lens-video
125-Upstream-Contact: David Calle <davidc@framli.eu>
126+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
127+Source: https://launchpad.net/unity-lens-video
128+Upstream-Name: Unity Video Lens
129
130 Files: *
131-Copyright: 2011 David Calle <davidc@framli.eu>
132-License: GPL-3.0+
133+Copyright: 2011-2013 Canonical Ltd
134+License: GPL-3
135 This program is free software: you can redistribute it and/or modify
136 it under the terms of the GNU General Public License as published by
137- the Free Software Foundation, either version 3 of the License, or
138- (at your option) any later version.
139+ the Free Software Foundation, version 3 of the License.
140 .
141 This program is distributed in the hope that it will be useful,
142 but WITHOUT ANY WARRANTY; without even the implied warranty of
143
144=== modified file 'debian/rules'
145--- debian/rules 2012-11-08 04:06:55 +0000
146+++ debian/rules 2013-02-18 11:25:33 +0000
147@@ -1,9 +1,14 @@
148 #!/usr/bin/make -f
149 # -*- makefile -*-
150
151-
152 %:
153- dh $@ --with python2,translations
154+ dh $@ --with autoreconf,translations
155+
156+override_dh_autoreconf:
157+ NOCONFIGURE=1 dh_autoreconf ./autogen.sh
158+
159+override_dh_auto_configure:
160+ dh_auto_configure -- --enable-headless-tests
161
162 override_dh_install:
163 dh_install --fail-missing
164
165=== added file 'debian/unity-lens-video.install'
166--- debian/unity-lens-video.install 1970-01-01 00:00:00 +0000
167+++ debian/unity-lens-video.install 2013-02-18 11:25:33 +0000
168@@ -0,0 +1,3 @@
169+/usr/lib/*/unity-lens-video/unity-video-lens-daemon
170+/usr/share/dbus-1/services/unity-lens-video.service
171+/usr/share/unity/lenses/video/video.lens
172
173=== added file 'debian/unity-scope-video-remote.install'
174--- debian/unity-scope-video-remote.install 1970-01-01 00:00:00 +0000
175+++ debian/unity-scope-video-remote.install 2013-02-18 11:25:33 +0000
176@@ -0,0 +1,3 @@
177+/usr/lib/*/unity-lens-video/unity-scope-video-remote
178+/usr/share/dbus-1/services/unity-scope-video-remote.service
179+/usr/share/unity/lenses/video/video-remote.scope
180
181=== modified file 'debian/watch'
182--- debian/watch 2012-03-21 21:41:31 +0000
183+++ debian/watch 2013-02-18 11:25:33 +0000
184@@ -1,2 +1,2 @@
185 version=3
186-http://launchpad.net/unity-lens-videos/+download .*/unity-lens-video-([0-9.]+)\.tar\.gz
187+http://launchpad.net/unity-lens-video/+download .*/unity-lens-video-([0-9.]+)\.tar\.gz
188
189=== modified file 'src/Makefile.am'
190--- src/Makefile.am 2012-11-19 11:00:54 +0000
191+++ src/Makefile.am 2013-02-18 11:25:33 +0000
192@@ -5,7 +5,7 @@
193
194 DATADIR = $(datadir)
195
196-libexec_PROGRAMS = \
197+pkglibexec_PROGRAMS = \
198 unity-video-lens-daemon \
199 unity-scope-video-remote \
200 $(NULL)

Subscribers

People subscribed via source and target branches