qtorganizer5-eds

Merge lp:~mterry/qtorganizer5-eds/cleanup-packaging into lp:~ubuntu-sdk-team/qtorganizer5-eds/trunk

  1. cleanup-packaging
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Omer Akram
Approved revision: 6
Merged at revision: 6
Proposed branch: lp:~mterry/qtorganizer5-eds/cleanup-packaging
Merge into: lp:~ubuntu-sdk-team/qtorganizer5-eds/trunk
Diff against target: 74 lines (+13/-8)
4 files modified
debian/changelog (+7/-0)
debian/control (+4/-1)
debian/rules (+1/-7)
debian/source/format (+1/-0)
To merge this branch: bzr merge lp:~mterry/qtorganizer5-eds/cleanup-packaging
Reviewer Review Type Date Requested Status
Ubuntu SDK team Pending
Review via email: mp+180427@code.launchpad.net

Commit message

Some small packaging cleanups

Description of the change

Some small packaging cleanups

To post a comment you must log in.
Revision history for this message
Omer Akram (om26er) wrote :

lgtm

lp:~mterry/qtorganizer5-eds/cleanup-packaging updated
7. By Michael Terry

Add snapshot comment for daily landing bot

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-08-14 21:25:36 +0000
3+++ debian/changelog 2013-08-15 20:58:23 +0000
4@@ -1,3 +1,10 @@
5+qtorganizer5-eds (0.1.1-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * Tiny package cleanups, add COPYING file
8+ * Automatic snapshot from revision 5
9+
10+ -- Michael Terry <mterry@ubuntu.com> Thu, 15 Aug 2013 16:40:05 -0400
11+
12 qtorganizer5-eds (0.1.0-0ubuntu1) saucy; urgency=low
13
14 * Initial release
15
16=== modified file 'debian/control'
17--- debian/control 2013-08-15 13:47:07 +0000
18+++ debian/control 2013-08-15 20:58:23 +0000
19@@ -3,7 +3,7 @@
20 Priority: optional
21 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
22 Build-Depends: cmake (>= 2.8.9),
23- debhelper (>= 9),
24+ debhelper (>= 9),
25 libecal1.2-dev,
26 libedataserver1.2-dev,
27 qt5-default,
28@@ -12,12 +12,15 @@
29 qtpim5-dev,
30 Standards-Version: 3.9.4
31 Homepage: https://launchpad.net/qtorganizer5-eds
32+# If you aren't a member of ~phablet-team but need to upload packaging changes,
33+# just go ahead. ~phablet-team will notice and sync up the code again.
34 Vcs-Bzr: https://code.launchpad.net/~phablet-team/qtorganizer5-eds/trunk
35 Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/qtorganizer5-eds/trunk/files
36
37 Package: qtorganizer5-eds
38 Architecture: any
39 Multi-Arch: same
40+Pre-Depends: ${misc:Pre-Depends},
41 Depends: ${misc:Depends},
42 ${shlibs:Depends},
43 Description: QtOrganizer engine for EDS calendar.
44
45=== modified file 'debian/rules'
46--- debian/rules 2013-08-14 21:23:01 +0000
47+++ debian/rules 2013-08-15 20:58:23 +0000
48@@ -1,18 +1,12 @@
49 #!/usr/bin/make -f
50 # -*- makefile -*-
51
52-# Uncomment this to turn on verbose mode.
53-#export DH_VERBOSE=1
54-
55 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
56
57 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
58
59 %:
60- dh $@ --parallel
61+ dh $@ --parallel --fail-missing
62
63 override_dh_auto_configure:
64 dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/address-book-service
65-
66-override_dh_install:
67- dh_install --fail-missing
68
69=== added directory 'debian/source'
70=== added file 'debian/source/format'
71--- debian/source/format 1970-01-01 00:00:00 +0000
72+++ debian/source/format 2013-08-15 20:58:23 +0000
73@@ -0,0 +1,1 @@
74+1.0

Subscribers

People subscribed via source and target branches

to all changes: