Merge lp:~laney/maliit-inputcontext-gtk/tweaks into lp:maliit-inputcontext-gtk

Proposed by Iain Lane on 2016-01-14
Status: Merged
Approved by: William Hua on 2016-01-14
Approved revision: 24
Merged at revision: 24
Proposed branch: lp:~laney/maliit-inputcontext-gtk/tweaks
Merge into: lp:maliit-inputcontext-gtk
Diff against target: 45 lines (+7/-6)
2 files modified
debian/control (+4/-4)
debian/rules (+3/-2)
To merge this branch: bzr merge lp:~laney/maliit-inputcontext-gtk/tweaks
Reviewer Review Type Date Requested Status
William Hua 2016-01-14 Approve on 2016-01-14
Review via email: mp+282571@code.launchpad.net
To post a comment you must log in.
William Hua (attente) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-11-19 18:06:28 +0000
3+++ debian/control 2016-01-14 11:39:37 +0000
4@@ -1,7 +1,8 @@
5 Source: maliit-inputcontext-gtk
6 Section: libs
7 Priority: optional
8-Maintainer: William Hua <william.hua@canonical.com>
9+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
10+Uploaders: William Hua <william.hua@canonical.com>
11 Build-Depends: debhelper (>= 9),
12 cmake,
13 qtbase5-dev,
14@@ -9,9 +10,8 @@
15 libgtk-3-dev,
16 libmaliit-glib-dev,
17 Standards-Version: 3.9.6
18-Homepage: https://launchpad.net/maliit-inputcontext-gtk
19-#Vcs-Git: git://anonscm.debian.org/collab-maint/maliit-inputcontext-gtk.git
20-#Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/maliit-inputcontext-gtk.git;a=summary
21+Vcs-Bzr: http://bazaar.launchpad.net/~attente/maliit-inputcontext-gtk/trunk
22+Vcs-Browser: https://code.launchpad.net/~attente/maliit-inputcontext-gtk/trunk
23
24 Package: maliit-inputcontext-gtk2
25 Architecture: any
26
27=== modified file 'debian/rules'
28--- debian/rules 2016-01-13 17:00:22 +0000
29+++ debian/rules 2016-01-14 11:39:37 +0000
30@@ -16,8 +16,6 @@
31 # package maintainers to append LDFLAGS
32 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
33
34-.PHONY: get-orig-source get-packaged-orig-source
35-
36 # main packaging script based on dh7 syntax
37 %:
38 dh $@
39@@ -39,3 +37,6 @@
40 dh_auto_configure -- \
41 -DLIB_INSTALL_DIR=`pkg-config --variable=libdir gtk+-3.0` \
42 -DENABLE_X11=ON
43+
44+#.PHONY: get-orig-source get-packaged-orig-source
45+

Subscribers

People subscribed via source and target branches

to all changes: