Merge lp:~mterry/unity-lens-shopping/inline-debian into lp:unity-lens-shopping

Proposed by Michael Terry
Status: Merged
Approved by: Francis Ginther
Approved revision: 33
Merged at revision: 33
Proposed branch: lp:~mterry/unity-lens-shopping/inline-debian
Merge into: lp:unity-lens-shopping
Diff against target: 149 lines (+113/-0)
7 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+45/-0)
debian/compat (+1/-0)
debian/control (+31/-0)
debian/copyright (+19/-0)
debian/rules (+13/-0)
debian/watch (+2/-0)
To merge this branch: bzr merge lp:~mterry/unity-lens-shopping/inline-debian
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+133112@code.launchpad.net

Commit message

Bring debian/ packaging inline.

Description of the change

As discussed at UDS-R, the separate debian/ packaging branches should be brought inline. This branch does that.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looks good to me, please switch to approve once the work in jenkins is done.

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

Approving to process autolanding.

Revision history for this message
Francis Ginther (fginther) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf 2012-11-06 17:31:25 +0000
@@ -0,0 +1,2 @@
1[BUILDDEB]
2split = True
03
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2012-11-06 17:31:25 +0000
@@ -0,0 +1,45 @@
1unity-lens-shopping (6.8.0-0ubuntu2) UNRELEASED; urgency=low
2
3 * debian/control:
4 - Update Vcs-Bzr
5 - Build-Depend on dh-autoreconf, gnome-common
6 * debian/rules:
7 - Use dh_autoreconf to call ./autogen.sh
8
9 -- Michael Terry <mterry@ubuntu.com> Tue, 06 Nov 2012 12:28:18 -0500
10
11unity-lens-shopping (6.8.0-0ubuntu1) quantal-proposed; urgency=low
12
13 [ Łukasz 'sil2100' Zemczak ]
14 * New upstream release.
15 - Use music lens details page for music store results (LP: #1055684)
16 - No easy way to disable online-fetched results in lenses (LP: #1054746)
17 - Display category emblems on results (LP: #1056901)
18 - Descriptions are missing all html tags (LP: #1058197)
19
20 [ Didier Roche ]
21 * debian/control:
22 - bump libunity build-dep
23
24 -- Didier Roche <didrocks@ubuntu.com> Thu, 04 Oct 2012 16:46:32 +0200
25
26unity-lens-shopping (6.0.0-0ubuntu2) quantal; urgency=low
27
28 [ Łukasz 'sil2100' Zemczak ]
29 * debian/control:
30 - Added build-dependencies to libsoup2.4-dev and libsoup-gnome2.4-dev, as
31 needed by the addition of secure connections
32
33 [ Iain Lane ]
34 * Cherry-pick upstream r22 to connect to the remote server using SSL (LP:
35 #1055649)
36
37 -- Iain Lane <iain.lane@canonical.com> Fri, 28 Sep 2012 18:01:02 +0100
38
39unity-lens-shopping (6.0.0-0ubuntu1) quantal-proposed; urgency=low
40
41 * Take Francis' initial packaging and fix it up + version fixing.
42 Putting the shopping lens to ubuntu (LP: #1053470)
43
44 -- Didier Roche <didrocks@ubuntu.com> Thu, 20 Sep 2012 17:16:37 +0200
45
046
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2012-11-06 17:31:25 +0000
@@ -0,0 +1,1 @@
19
02
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2012-11-06 17:31:25 +0000
@@ -0,0 +1,31 @@
1Source: unity-lens-shopping
2Section: gnome
3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Build-Depends: debhelper (>= 9),
6 pkg-config,
7 dh-autoreconf,
8 dh-translations,
9 gnome-common,
10 valac (>= 0.16),
11 libglib2.0-dev (>= 2.27),
12 libgee-dev,
13 libjson-glib-dev,
14 libdee-dev (>= 1.0.7),
15 libunity-dev (>= 6.8),
16 libsoup2.4-dev,
17 libsoup-gnome2.4-dev,
18Standards-Version: 3.9.3
19Homepage: https://launchpad.net/unity-lens-shopping
20# If you aren't a member of ~unity-team but need to upload packaging changes,
21# just go ahead. ~unity-team will notice and sync up the code again.
22Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-shopping/trunk
23
24Package: unity-lens-shopping
25Architecture: any
26Depends: ${shlibs:Depends},
27 ${misc:Depends}
28Description: Shopping lens for unity
29 This package contains the "shopping" lens which can be used
30 into Unity to shop online.
31
032
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2012-11-06 17:31:25 +0000
@@ -0,0 +1,19 @@
1Format: http://dep.debian.net/deps/dep5/
2Upstream-Name: unity-lens-copyright
3Upstream-Contact: Michal Hruby <michal.hruby@canonical.com>
4Source: https://launchpad.net/unity-lens-shopping/+download
5
6File: *
7Copyright: 2010-2012 Canonical Ltd
8License: GPL-3
9 This program is free software: you can redistribute it and/or modify
10 it under the terms of the GNU General Public License version 3 as
11 published by the Free Software Foundation.
12 .
13 This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details.
17 .
18 On Debian/Ubuntu systems, the full text of the GPL v3 can be found in
19 `/usr/share/common-licenses/GPL-3'
020
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2012-11-06 17:31:25 +0000
@@ -0,0 +1,13 @@
1#!/usr/bin/make -f
2# -*- makefile -*-
3
4# Uncomment this to turn on verbose mode.
5#export DH_VERBOSE=1
6
7export DEB_BUILD_MAINT_OPTIONS := hardening=+all
8
9%:
10 dh $@ --with autoreconf,translations
11
12override_dh_autoreconf:
13 NOCONFIGURE=1 dh_autoreconf ./autogen.sh
014
=== added file 'debian/watch'
--- debian/watch 1970-01-01 00:00:00 +0000
+++ debian/watch 2012-11-06 17:31:25 +0000
@@ -0,0 +1,2 @@
1version=3
2https://launchpad.net/unity-lens-shopping/+download .*/unity-lens-shopping-([0-9.]+)\.tar\.gz

Subscribers

People subscribed via source and target branches

to all changes: