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 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 (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
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2012-11-06 17:31:25 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== added directory 'debian'
10=== added file 'debian/changelog'
11--- debian/changelog 1970-01-01 00:00:00 +0000
12+++ debian/changelog 2012-11-06 17:31:25 +0000
13@@ -0,0 +1,45 @@
14+unity-lens-shopping (6.8.0-0ubuntu2) UNRELEASED; urgency=low
15+
16+ * debian/control:
17+ - Update Vcs-Bzr
18+ - Build-Depend on dh-autoreconf, gnome-common
19+ * debian/rules:
20+ - Use dh_autoreconf to call ./autogen.sh
21+
22+ -- Michael Terry <mterry@ubuntu.com> Tue, 06 Nov 2012 12:28:18 -0500
23+
24+unity-lens-shopping (6.8.0-0ubuntu1) quantal-proposed; urgency=low
25+
26+ [ Łukasz 'sil2100' Zemczak ]
27+ * New upstream release.
28+ - Use music lens details page for music store results (LP: #1055684)
29+ - No easy way to disable online-fetched results in lenses (LP: #1054746)
30+ - Display category emblems on results (LP: #1056901)
31+ - Descriptions are missing all html tags (LP: #1058197)
32+
33+ [ Didier Roche ]
34+ * debian/control:
35+ - bump libunity build-dep
36+
37+ -- Didier Roche <didrocks@ubuntu.com> Thu, 04 Oct 2012 16:46:32 +0200
38+
39+unity-lens-shopping (6.0.0-0ubuntu2) quantal; urgency=low
40+
41+ [ Łukasz 'sil2100' Zemczak ]
42+ * debian/control:
43+ - Added build-dependencies to libsoup2.4-dev and libsoup-gnome2.4-dev, as
44+ needed by the addition of secure connections
45+
46+ [ Iain Lane ]
47+ * Cherry-pick upstream r22 to connect to the remote server using SSL (LP:
48+ #1055649)
49+
50+ -- Iain Lane <iain.lane@canonical.com> Fri, 28 Sep 2012 18:01:02 +0100
51+
52+unity-lens-shopping (6.0.0-0ubuntu1) quantal-proposed; urgency=low
53+
54+ * Take Francis' initial packaging and fix it up + version fixing.
55+ Putting the shopping lens to ubuntu (LP: #1053470)
56+
57+ -- Didier Roche <didrocks@ubuntu.com> Thu, 20 Sep 2012 17:16:37 +0200
58+
59
60=== added file 'debian/compat'
61--- debian/compat 1970-01-01 00:00:00 +0000
62+++ debian/compat 2012-11-06 17:31:25 +0000
63@@ -0,0 +1,1 @@
64+9
65
66=== added file 'debian/control'
67--- debian/control 1970-01-01 00:00:00 +0000
68+++ debian/control 2012-11-06 17:31:25 +0000
69@@ -0,0 +1,31 @@
70+Source: unity-lens-shopping
71+Section: gnome
72+Priority: optional
73+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
74+Build-Depends: debhelper (>= 9),
75+ pkg-config,
76+ dh-autoreconf,
77+ dh-translations,
78+ gnome-common,
79+ valac (>= 0.16),
80+ libglib2.0-dev (>= 2.27),
81+ libgee-dev,
82+ libjson-glib-dev,
83+ libdee-dev (>= 1.0.7),
84+ libunity-dev (>= 6.8),
85+ libsoup2.4-dev,
86+ libsoup-gnome2.4-dev,
87+Standards-Version: 3.9.3
88+Homepage: https://launchpad.net/unity-lens-shopping
89+# If you aren't a member of ~unity-team but need to upload packaging changes,
90+# just go ahead. ~unity-team will notice and sync up the code again.
91+Vcs-Bzr: https://code.launchpad.net/~unity-team/unity-lens-shopping/trunk
92+
93+Package: unity-lens-shopping
94+Architecture: any
95+Depends: ${shlibs:Depends},
96+ ${misc:Depends}
97+Description: Shopping lens for unity
98+ This package contains the "shopping" lens which can be used
99+ into Unity to shop online.
100+
101
102=== added file 'debian/copyright'
103--- debian/copyright 1970-01-01 00:00:00 +0000
104+++ debian/copyright 2012-11-06 17:31:25 +0000
105@@ -0,0 +1,19 @@
106+Format: http://dep.debian.net/deps/dep5/
107+Upstream-Name: unity-lens-copyright
108+Upstream-Contact: Michal Hruby <michal.hruby@canonical.com>
109+Source: https://launchpad.net/unity-lens-shopping/+download
110+
111+File: *
112+Copyright: 2010-2012 Canonical Ltd
113+License: GPL-3
114+ This program is free software: you can redistribute it and/or modify
115+ it under the terms of the GNU General Public License version 3 as
116+ published by the Free Software Foundation.
117+ .
118+ This program is distributed in the hope that it will be useful,
119+ but WITHOUT ANY WARRANTY; without even the implied warranty of
120+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
121+ GNU General Public License for more details.
122+ .
123+ On Debian/Ubuntu systems, the full text of the GPL v3 can be found in
124+ `/usr/share/common-licenses/GPL-3'
125
126=== added file 'debian/rules'
127--- debian/rules 1970-01-01 00:00:00 +0000
128+++ debian/rules 2012-11-06 17:31:25 +0000
129@@ -0,0 +1,13 @@
130+#!/usr/bin/make -f
131+# -*- makefile -*-
132+
133+# Uncomment this to turn on verbose mode.
134+#export DH_VERBOSE=1
135+
136+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
137+
138+%:
139+ dh $@ --with autoreconf,translations
140+
141+override_dh_autoreconf:
142+ NOCONFIGURE=1 dh_autoreconf ./autogen.sh
143
144=== added file 'debian/watch'
145--- debian/watch 1970-01-01 00:00:00 +0000
146+++ debian/watch 2012-11-06 17:31:25 +0000
147@@ -0,0 +1,2 @@
148+version=3
149+https://launchpad.net/unity-lens-shopping/+download .*/unity-lens-shopping-([0-9.]+)\.tar\.gz

Subscribers

People subscribed via source and target branches

to all changes: