Merge lp:~didrocks/unity-lens-video/new_packaging into lp:~stolowski/unity-lens-video/vala-rewrite

Proposed by Didier Roche on 2012-12-07
Status: Merged
Merge reported by: Didier Roche
Merged at revision: not available
Proposed branch: lp:~didrocks/unity-lens-video/new_packaging
Merge into: lp:~stolowski/unity-lens-video/vala-rewrite
Diff against target: 180 lines (+61/-20)
10 files modified
data/Makefile.am (+1/-1)
data/unity-lens-video.service.in (+1/-1)
data/unity-scope-video-remote.service.in (+1/-1)
debian/changelog (+19/-3)
debian/control (+24/-10)
debian/rules (+8/-1)
debian/unity-lens-video.install (+3/-0)
debian/unity-scope-video-remote.install (+3/-0)
debian/watch (+0/-2)
src/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~didrocks/unity-lens-video/new_packaging
Reviewer Review Type Date Requested Status
Paweł Stołowski 2012-12-07 Pending
Review via email: mp+138663@code.launchpad.net

Commit message

Add packaging changes for the vala rewrite

Description of the change

Add packaging changes for the vala rewrite

To post a comment you must log in.
Michal Hruby (mhr3) wrote :

Looks like this got merged without LP noticing, can we close the MP pls?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2012-11-22 16:20:45 +0000
3+++ data/Makefile.am 2012-12-07 09:08:22 +0000
4@@ -7,7 +7,7 @@
5 dbus_services_DATA = $(service_in_files:.service.in=.service)
6
7 %.service: %.service.in
8- $(AM_V_GEN)sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
9+ $(AM_V_GEN)sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
10
11 lens_in_files = video.lens.in video-remote.scope
12 lensdir = $(LENSESDIR)/video
13
14=== modified file 'data/unity-lens-video.service.in'
15--- data/unity-lens-video.service.in 2012-11-22 14:41:31 +0000
16+++ data/unity-lens-video.service.in 2012-12-07 09:08:22 +0000
17@@ -1,3 +1,3 @@
18 [D-BUS Service]
19 Name=net.launchpad.lens.video
20-Exec=@libexecdir@/unity-video-lens-daemon
21+Exec=@pkglibexecdir@/unity-video-lens-daemon
22
23=== modified file 'data/unity-scope-video-remote.service.in'
24--- data/unity-scope-video-remote.service.in 2012-11-22 12:23:14 +0000
25+++ data/unity-scope-video-remote.service.in 2012-12-07 09:08:22 +0000
26@@ -1,3 +1,3 @@
27 [D-BUS Service]
28 Name=net.launchpad.scope.RemoteVideos
29-Exec=@libexecdir@/unity-scope-video-remote
30+Exec=@pkglibexecdir@/unity-scope-video-remote
31
32=== modified file 'debian/changelog'
33--- debian/changelog 2012-11-15 17:09:41 +0000
34+++ debian/changelog 2012-12-07 09:08:22 +0000
35@@ -1,5 +1,18 @@
36-unity-lens-video (0.3.14-0ubuntu2) UNRELEASED; urgency=low
37-
38+unity-lens-video (0.3.14daily12.12.05-0ubuntu2) UNRELEASED; urgency=low
39+
40+ * change the packaging for now scopes in vala
41+ * merged unity-scope-video-remote into this packaging
42+ * runs the tests by default
43+ * debian/watch:
44+ - removed, not anymore needed with automatic snapshot and annoying when
45+ doing packaging fixes
46+ * install upstream files in pkglibexecdir rather than libexecdir
47+
48+ -- Didier Roche <didrocks@ubuntu.com> Fri, 07 Dec 2012 09:49:58 +0100
49+
50+unity-lens-video (0.3.14daily12.12.05-0ubuntu1) raring; urgency=low
51+
52+ [ Michael Terry ]
53 * debian/control:
54 - Update Bzr-Vcs
55 - Bump required debhelper to 9
56@@ -7,7 +20,10 @@
57 - Use --fail-missing
58 * Automatic snapshot from revision 102 (bootstrap)
59
60- -- Michael Terry <mterry@ubuntu.com> Mon, 05 Nov 2012 14:08:07 -0500
61+ [ Automatic PS uploader ]
62+ * Automatic snapshot from revision 104
63+
64+ -- Automatic PS uploader <ps-jenkins@lists.canonical.com> Wed, 05 Dec 2012 09:29:20 +0000
65
66 unity-lens-video (0.3.14-0ubuntu1) quantal-proposed; urgency=low
67
68
69=== modified file 'debian/control'
70--- debian/control 2012-11-08 04:06:55 +0000
71+++ debian/control 2012-12-07 09:08:22 +0000
72@@ -4,9 +4,19 @@
73 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
74 XSBC-Original-Maintainer: David Calle <davidc@framli.eu>
75 Build-Depends: debhelper (>= 9),
76- python,
77- python-distutils-extra,
78+ pkg-config,
79+ dh-autoreconf,
80 dh-translations,
81+ gnome-common,
82+ valac (>= 0.16),
83+ libglib2.0-dev (>= 2.27),
84+ libgee-dev,
85+ libdee-dev (>= 1.0.7),
86+ libsoup-gnome2.4-dev,
87+ libjson-glib-dev,
88+ libzeitgeist-dev,
89+ libunity-dev (>= 6.90),
90+ xvfb,
91 Standards-Version: 3.9.3
92 Homepage: https://launchpad.net/unity-lens-videos
93 # If you aren't a member of ~unity-team but need to upload packaging changes,
94@@ -14,16 +24,20 @@
95 Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-videos/trunk
96
97 Package: unity-lens-video
98-Architecture: all
99-Depends: ${misc:Depends},
100- ${python:Depends},
101- gir1.2-unity-5.0,
102- gir1.2-dee-1.0,
103- gir1.2-glib-2.0,
104- python-zeitgeist,
105- unity-lens-music (>= 6.6.0),
106+Architecture: any
107+Depends: ${shlibs:Depends},
108+ ${misc:Depends},
109 Recommends: unity-scope-video-remote
110 Breaks: unity (<< 6.0.0),
111 Description: Unity Video lens
112 A plugin to search videos in the Dash.
113
114+Package: unity-scope-video-remote
115+Architecture: any
116+Depends: ${shlibs:Depends},
117+ ${misc:Depends},
118+ unity-lens-video (= ${binary:Version}),
119+Enhances: unity-lens-video
120+Description: Remote videos engine
121+ This scope adds a remote videos search engine to the Video lens.
122+
123
124=== modified file 'debian/rules'
125--- debian/rules 2012-11-08 04:06:55 +0000
126+++ debian/rules 2012-12-07 09:08:22 +0000
127@@ -1,9 +1,16 @@
128 #!/usr/bin/make -f
129 # -*- makefile -*-
130
131+# Uncomment this to turn on verbose mode.
132+#export DH_VERBOSE=1
133+
134+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
135
136 %:
137- dh $@ --with python2,translations
138+ dh $@ --with autoreconf,translations
139+
140+override_dh_autoreconf:
141+ NOCONFIGURE=1 dh_autoreconf ./autogen.sh
142
143 override_dh_install:
144 dh_install --fail-missing
145
146=== added file 'debian/unity-lens-video.install'
147--- debian/unity-lens-video.install 1970-01-01 00:00:00 +0000
148+++ debian/unity-lens-video.install 2012-12-07 09:08:22 +0000
149@@ -0,0 +1,3 @@
150+usr/lib/*/*/unity-video-lens-daemon
151+usr/share/dbus-1/services/unity-lens-video.service
152+usr/share/unity/lenses/video/video.lens
153
154=== added file 'debian/unity-scope-video-remote.install'
155--- debian/unity-scope-video-remote.install 1970-01-01 00:00:00 +0000
156+++ debian/unity-scope-video-remote.install 2012-12-07 09:08:22 +0000
157@@ -0,0 +1,3 @@
158+usr/lib/*/*/unity-scope-video-remote
159+usr/share/dbus-1/services/unity-scope-video-remote.service
160+usr/share/unity/lenses/video/video-remote.scope
161
162=== removed file 'debian/watch'
163--- debian/watch 2012-03-21 21:41:31 +0000
164+++ debian/watch 1970-01-01 00:00:00 +0000
165@@ -1,2 +0,0 @@
166-version=3
167-http://launchpad.net/unity-lens-videos/+download .*/unity-lens-video-([0-9.]+)\.tar\.gz
168
169=== modified file 'src/Makefile.am'
170--- src/Makefile.am 2012-11-19 11:00:54 +0000
171+++ src/Makefile.am 2012-12-07 09:08:22 +0000
172@@ -5,7 +5,7 @@
173
174 DATADIR = $(datadir)
175
176-libexec_PROGRAMS = \
177+pkglibexec_PROGRAMS = \
178 unity-video-lens-daemon \
179 unity-scope-video-remote \
180 $(NULL)

Subscribers

People subscribed via source and target branches