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

[Didier Roche-Tolomelli]

Add packaging changes for the vala rewrite

Add packaging changes for the vala rewrite

[Michal Hruby (mhr3)]

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

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-11-22 16:20:45 +0000
+++ data/Makefile.am	2012-12-07 09:08:22 +0000
@@ -7,7 +7,7 @@
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
-	$(AM_V_GEN)sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	$(AM_V_GEN)sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 lens_in_files = video.lens.in video-remote.scope
 lensdir = $(LENSESDIR)/video
 
=== 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	2012-12-07 09:08:22 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=net.launchpad.lens.video
-Exec=@libexecdir@/unity-video-lens-daemon
+Exec=@pkglibexecdir@/unity-video-lens-daemon
 
=== 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	2012-12-07 09:08:22 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=net.launchpad.scope.RemoteVideos
-Exec=@libexecdir@/unity-scope-video-remote
+Exec=@pkglibexecdir@/unity-scope-video-remote
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-11-15 17:09:41 +0000
+++ debian/changelog	2012-12-07 09:08:22 +0000
@@ -1,5 +1,18 @@
-unity-lens-video (0.3.14-0ubuntu2) UNRELEASED; urgency=low
-
+unity-lens-video (0.3.14daily12.12.05-0ubuntu2) UNRELEASED; urgency=low
+
+  * change the packaging for now scopes in vala
+  * merged unity-scope-video-remote into this packaging
+  * runs the tests by default
+  * debian/watch:
+    - removed, not anymore needed with automatic snapshot and annoying when
+      doing packaging fixes
+  * install upstream files in pkglibexecdir rather than libexecdir
+
+ -- Didier Roche <[e-mail]>  Fri, 07 Dec 2012 09:49:58 +0100
+
+unity-lens-video (0.3.14daily12.12.05-0ubuntu1) raring; urgency=low
+
+  [ Michael Terry ]
   * debian/control:
     - Update Bzr-Vcs
     - Bump required debhelper to 9
@@ -7,7 +20,10 @@
     - Use --fail-missing
   * Automatic snapshot from revision 102 (bootstrap)
 
- -- Michael Terry <[e-mail]>  Mon, 05 Nov 2012 14:08:07 -0500
+  [ Automatic PS uploader ]
+  * Automatic snapshot from revision 104
+
+ -- Automatic PS uploader <[e-mail]>  Wed, 05 Dec 2012 09:29:20 +0000
 
 unity-lens-video (0.3.14-0ubuntu1) quantal-proposed; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2012-11-08 04:06:55 +0000
+++ debian/control	2012-12-07 09:08:22 +0000
@@ -4,9 +4,19 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: David Calle <[e-mail]>
 Build-Depends: debhelper (>= 9), 
-               python, 
-               python-distutils-extra,
+               pkg-config,
+               dh-autoreconf,
                dh-translations,
+               gnome-common,
+               valac (>= 0.16),
+               libglib2.0-dev (>= 2.27),
+               libgee-dev,
+               libdee-dev (>= 1.0.7),
+               libsoup-gnome2.4-dev,
+               libjson-glib-dev,
+               libzeitgeist-dev,
+               libunity-dev (>= 6.90),
+               xvfb,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/unity-lens-videos
 # If you aren't a member of ~unity-team but need to upload packaging changes,
@@ -14,16 +24,20 @@
 Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-videos/trunk
 
 Package: unity-lens-video
-Architecture: all
-Depends: ${misc:Depends},
-         ${python:Depends},
-         gir1.2-unity-5.0,
-         gir1.2-dee-1.0,
-         gir1.2-glib-2.0,
-         python-zeitgeist,
-         unity-lens-music (>= 6.6.0),
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
 Recommends: unity-scope-video-remote
 Breaks: unity (<< 6.0.0),
 Description: Unity Video lens
  A plugin to search videos in the Dash.
 
+Package: unity-scope-video-remote
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         unity-lens-video (= ${binary:Version}),
+Enhances: unity-lens-video
+Description: Remote videos engine
+ This scope adds a remote videos search engine to the Video lens.
+
 
=== modified file 'debian/rules'
--- debian/rules	2012-11-08 04:06:55 +0000
+++ debian/rules	2012-12-07 09:08:22 +0000
@@ -1,9 +1,16 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
 
 %:
-	dh $@ --with python2,translations
+	dh $@ --with autoreconf,translations
+
+override_dh_autoreconf:
+	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
 override_dh_install:
 	dh_install --fail-missing
 
=== added file 'debian/unity-lens-video.install'
--- debian/unity-lens-video.install	1970-01-01 00:00:00 +0000
+++ debian/unity-lens-video.install	2012-12-07 09:08:22 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/*/unity-video-lens-daemon
+usr/share/dbus-1/services/unity-lens-video.service
+usr/share/unity/lenses/video/video.lens
 
=== 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	2012-12-07 09:08:22 +0000
@@ -0,0 +1,3 @@
+usr/lib/*/*/unity-scope-video-remote
+usr/share/dbus-1/services/unity-scope-video-remote.service
+usr/share/unity/lenses/video/video-remote.scope
 
=== removed file 'debian/watch'
--- debian/watch	2012-03-21 21:41:31 +0000
+++ debian/watch	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-version=3
-http://launchpad.net/unity-lens-videos/+download .*/unity-lens-video-([0-9.]+)\.tar\.gz
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-11-19 11:00:54 +0000
+++ src/Makefile.am	2012-12-07 09:08:22 +0000
@@ -5,7 +5,7 @@
 
 DATADIR = $(datadir)
 
-libexec_PROGRAMS = \
+pkglibexec_PROGRAMS = \
 	unity-video-lens-daemon \
 	unity-scope-video-remote \
 	$(NULL)