Merge lp:~cyphermox/qmenumodel/arch-exclude-powerpc-again into lp:~phablet-team/qmenumodel/trunk

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 88
Merged at revision: 88
Proposed branch: lp:~cyphermox/qmenumodel/arch-exclude-powerpc-again
Merge into: lp:~phablet-team/qmenumodel/trunk
Diff against target: 67 lines (+15/-5)
3 files modified
debian/changelog (+10/-0)
debian/control (+4/-4)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~cyphermox/qmenumodel/arch-exclude-powerpc-again
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Sebastien Bacher Approve
Ubuntu Phablet Team Pending
Review via email: mp+184558@code.launchpad.net

Commit message

Add changelog for manual upload of 0.2.7+13.10.20130830-0ubuntu2

Description of the change

Add changelog for manual upload of 0.2.7+13.10.20130830-0ubuntu2

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

that looks fine, thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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-30 18:06:44 +0000
3+++ debian/changelog 2013-09-09 12:45:39 +0000
4@@ -1,3 +1,13 @@
5+qmenumodel (0.2.7+13.10.20130830-0ubuntu2) saucy; urgency=low
6+
7+ * Switch to Architecture: any to hopefully get a powerpc build; seems
8+ nothing is arch-specific in this package which is a bdep of
9+ indicator-network, and build-deps such as libgles2-mesa-dev seem to be
10+ available on powerpc.
11+ * Bump Standards-Version to 3.9.4; no change needed.
12+
13+ -- Loïc Minier <loic.minier@ubuntu.com> Sat, 07 Sep 2013 12:40:38 +0200
14+
15 qmenumodel (0.2.7+13.10.20130830-0ubuntu1) saucy; urgency=low
16
17 [ Nick Dedekind ]
18
19=== modified file 'debian/control'
20--- debian/control 2013-04-23 20:31:19 +0000
21+++ debian/control 2013-09-09 12:45:39 +0000
22@@ -15,7 +15,7 @@
23 gir1.2-glib-2.0,
24 dbus-test-runner,
25 libgles2-mesa-dev | libgl-dev,
26-Standards-Version: 3.9.3
27+Standards-Version: 3.9.4
28 Homepage: https://launchpad.net/qmenumodel
29 # If you aren't a member of ~phablet-team but need to upload
30 # packaging changes, just go ahead. ~phablet-team will notice
31@@ -25,7 +25,7 @@
32
33 Package: libqmenumodel0
34 Section: libs
35-Architecture: amd64 armhf i386
36+Architecture: any
37 Depends: ${shlibs:Depends},
38 ${misc:Depends},
39 Pre-Depends: ${misc:Pre-Depends}
40@@ -39,7 +39,7 @@
41
42 Package: libqmenumodel-dev
43 Section: libdevel
44-Architecture: amd64 armhf i386
45+Architecture: any
46 Depends: ${shlibs:Depends},
47 ${misc:Depends},
48 libqmenumodel0 (= ${binary:Version}),
49@@ -52,7 +52,7 @@
50
51 Package: qmenumodel-qml
52 Section: libs
53-Architecture: amd64 armhf i386
54+Architecture: any
55 Depends: ${shlibs:Depends},
56 ${misc:Depends},
57 libqmenumodel0 (= ${binary:Version}),
58
59=== modified file 'debian/rules'
60--- debian/rules 2013-03-25 15:53:28 +0000
61+++ debian/rules 2013-09-09 12:45:39 +0000
62@@ -10,4 +10,4 @@
63 dh_makeshlibs -Xlibqmenumodel-qml.so
64
65 override_dh_install:
66- dh_install --fail-missing
67+ dh_install --fail-missing

Subscribers

People subscribed via source and target branches