Merge lp:~sil2100/ubuntu-geoip/packaging_review into lp:ubuntu-geoip

Proposed by Łukasz Zemczak on 2013-07-09
Status: Merged
Approved by: Robert Bruce Park on 2013-07-09
Approved revision: 36
Merged at revision: 36
Proposed branch: lp:~sil2100/ubuntu-geoip/packaging_review
Merge into: lp:ubuntu-geoip
Diff against target: 123 lines (+35/-17)
7 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+9/-0)
debian/compat (+1/-0)
debian/control (+16/-12)
debian/copyright (+2/-2)
debian/rules (+5/-1)
debian/watch (+0/-2)
To merge this branch: bzr merge lp:~sil2100/ubuntu-geoip/packaging_review
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-07-09
Robert Bruce Park (community) 2013-07-09 Approve on 2013-07-09
Review via email: mp+173767@code.launchpad.net

Commit message

Modifications related to compliance with our packaging standards

Description of the change

Packaging review. Modifications related to compliance with our packaging standards

To post a comment you must log in.
Robert Bruce Park (robru) wrote :

Looks good, I like that you alphabetized the deps and stripped trailing whitespace ;-)

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

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 2013-07-09 16:13:35 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== modified file 'debian/changelog'
10--- debian/changelog 2012-11-12 17:58:30 +0000
11+++ debian/changelog 2013-07-09 16:13:35 +0000
12@@ -1,3 +1,12 @@
13+ubuntu-geoip (1.0.2-0ubuntu1) UNRELEASED; urgency=low
14+
15+ * Remove debian/watch
16+ * debian/rules, debian/control, debian/copyright, debian/compat:
17+ - Modifications related to compliance with our packaging standards
18+ * Automatic snapshot from revision 35 (bootstrap)
19+
20+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Tue, 09 Jul 2013 17:32:55 +0200
21+
22 ubuntu-geoip (1.0.1-0ubuntu2) raring; urgency=low
23
24 * debian/control: build-depends on libdbustest1-dev
25
26=== added file 'debian/compat'
27--- debian/compat 1970-01-01 00:00:00 +0000
28+++ debian/compat 2013-07-09 16:13:35 +0000
29@@ -0,0 +1,1 @@
30+9
31
32=== modified file 'debian/control'
33--- debian/control 2013-03-13 01:12:42 +0000
34+++ debian/control 2013-07-09 16:13:35 +0000
35@@ -2,28 +2,32 @@
36 Section: gnome
37 Priority: optional
38 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
39-Build-Depends: debhelper (>= 9.0),
40+Build-Depends: dbus-test-runner,
41+ debhelper (>= 9.0),
42 dh-autoreconf,
43+ gnome-common,
44 intltool,
45- gnome-common,
46- pkg-config,
47+ libdbustest1-dev,
48+ libgeoclue-dev,
49 libglib2.0-dev,
50+ libnm-glib-dev (>= 0.8.998),
51+ libsoup-gnome2.4-dev,
52 libsoup2.4-dev,
53- libsoup-gnome2.4-dev,
54- libgeoclue-dev,
55- libnm-glib-dev (>= 0.8.998),
56- libdbustest1-dev,
57- dbus-test-runner,
58+ pkg-config,
59 Standards-Version: 3.9.1
60 Homepage: https://launchpad.net/ubuntu-geoip
61-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/ubuntu-geoip/ubuntu
62+# If you aren't a member of ~ubuntu-geoip-team but need to upload packaging
63+# changes, just go ahead. ~ubuntu-geoip-team will notice and sync up the code
64+# again.
65+Vcs-Bzr: https://code.launchpad.net/~ubuntu-geoip-team/ubuntu-geoip/trunk
66+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-geoip-team/ubuntu-geoip/trunk/files
67
68 Package: geoclue-ubuntu-geoip
69 Architecture: any
70-Depends: ${shlibs:Depends},
71+Depends: geoclue,
72 ${misc:Depends},
73- geoclue
74-Provides: geoclue-provider
75+ ${shlibs:Depends},
76+Provides: geoclue-provider,
77 Description: Provide positioning for GeoClue via Ubuntu GeoIP services
78 GeoClue provides applications access to various geographical information
79 sources using a D-Bus API or a C library.
80
81=== modified file 'debian/copyright'
82--- debian/copyright 2010-11-15 14:05:13 +0000
83+++ debian/copyright 2013-07-09 16:13:35 +0000
84@@ -8,12 +8,12 @@
85 This program is free software: you can redistribute it and/or modify
86 it under the terms of the GNU General Public License version 3 as
87 published by the Free Software Foundation.
88-
89+
90 This program is distributed in the hope that it will be useful,
91 but WITHOUT ANY WARRANTY; without even the implied warranty of
92 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
93 GNU General Public License for more details.
94-
95+
96 You should have received a copy of the GNU General Public License
97 along with this program. If not, see <http://www.gnu.org/licenses/>.
98
99
100=== modified file 'debian/rules'
101--- debian/rules 2012-11-27 20:06:12 +0000
102+++ debian/rules 2013-07-09 16:13:35 +0000
103@@ -1,8 +1,12 @@
104 #!/usr/bin/make -f
105
106+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
107+
108 %:
109- dh --with autoreconf $@
110+ dh $@ --with autoreconf
111
112 override_dh_autoreconf:
113 NOCONFIGURE=1 dh_autoreconf ./autogen.sh
114
115+override_dh_install:
116+ dh_install --fail-missing
117
118=== removed file 'debian/watch'
119--- debian/watch 2010-11-15 15:33:52 +0000
120+++ debian/watch 1970-01-01 00:00:00 +0000
121@@ -1,2 +0,0 @@
122-version=3
123-https://launchpad.net/ubuntu-geoip/+download .*/ubuntu-geoip-([0-9.]+)\.tar\.gz

Subscribers

People subscribed via source and target branches