qtubuntu-print

Merge lp:~ken-vandine/qtubuntu-print/packaging_cleanup into lp:~ahayzen/qtubuntu-print/empty-branch-for-bileto

  1. packaging_cleanup
  2. Merge into empty-branch-for-bileto
Proposed by Ken VanDine
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 26
Merged at revision: 23
Proposed branch: lp:~ken-vandine/qtubuntu-print/packaging_cleanup
Merge into: lp:~ahayzen/qtubuntu-print/empty-branch-for-bileto
Diff against target: 71 lines (+23/-16)
3 files modified
debian/changelog (+1/-1)
debian/control (+15/-15)
debian/rules (+7/-0)
To merge this branch: bzr merge lp:~ken-vandine/qtubuntu-print/packaging_cleanup
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Review via email: mp+317676@code.launchpad.net

Commit message

Packaging cleanup, mostly just quieting down lintian. I also ran wrap-and-sort to format debian/control to match our other packages

Description of the change

Packaging cleanup, mostly just quieting down lintian. I also ran wrap-and-sort to format debian/control to match our other packages

To post a comment you must log in.
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Awesome, thanks!

review: Approve

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 2017-01-12 11:57:35 +0000
3+++ debian/changelog 2017-02-17 20:24:27 +0000
4@@ -1,4 +1,4 @@
5-qtubuntu-print (0.1-1) unstable; urgency=medium
6+qtubuntu-print (0.1-1) UNRELEASED; urgency=medium
7
8 * Initial release
9
10
11=== modified file 'debian/control'
12--- debian/control 2017-02-01 16:52:05 +0000
13+++ debian/control 2017-02-17 20:24:27 +0000
14@@ -3,26 +3,26 @@
15 Priority: optional
16 Maintainer: Andrew Hayzen <andrew.hayzen@canonical.com>
17 Build-Depends: cmake (>= 2.8.9),
18- debhelper (>=9),
19- dh-translations,
20- libcontent-hub-dev,
21- libqt5printsupport5,
22- libqt5widgets5,
23- pkg-config,
24- qt5-default,
25- qt5-qmake,
26- qtbase5-dev,
27- qtbase5-private-dev
28-Standards-Version: 3.9.6
29+ debhelper (>=9),
30+ dh-translations,
31+ libcontent-hub-dev,
32+ libqt5printsupport5,
33+ libqt5widgets5,
34+ pkg-config,
35+ qt5-qmake,
36+ qtbase5-dev,
37+ qtbase5-private-dev
38+Standards-Version: 3.9.7
39 Homepage: http://launchpad.net/qtubuntu-print
40 Vcs-Bzr: https://code.launchpad.net/~phablet-team/qtubuntu-print/trunk
41
42 Package: qtubuntu-print
43 Architecture: any
44-Depends: ${shlibs:Depends}, ${misc:Depends},
45- content-hub,
46- libqt5printsupport5,
47- libqt5widgets5
48+Depends: content-hub,
49+ libqt5printsupport5,
50+ libqt5widgets5,
51+ ${misc:Depends},
52+ ${shlibs:Depends}
53 Recommends: ubuntu-printing-app
54 Description: Print plugin for Qt sending PDFs over content-hub
55 A printing plugin for Qt which creates a PDF and sends it
56
57=== modified file 'debian/rules'
58--- debian/rules 2017-02-13 10:49:04 +0000
59+++ debian/rules 2017-02-17 20:24:27 +0000
60@@ -1,5 +1,12 @@
61 #!/usr/bin/make -f
62
63+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
64+
65+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
66+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
67+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
68+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
69+
70 %:
71 dh $@
72

Subscribers

People subscribed via source and target branches

to all changes: