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

Proposed by Iain Lane
Status: Merged
Approved by: William Hua
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 Approve
Review via email: mp+282571@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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
=== modified file 'debian/control'
--- debian/control 2015-11-19 18:06:28 +0000
+++ debian/control 2016-01-14 11:39:37 +0000
@@ -1,7 +1,8 @@
1Source: maliit-inputcontext-gtk1Source: maliit-inputcontext-gtk
2Section: libs2Section: libs
3Priority: optional3Priority: optional
4Maintainer: William Hua <william.hua@canonical.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Uploaders: William Hua <william.hua@canonical.com>
5Build-Depends: debhelper (>= 9),6Build-Depends: debhelper (>= 9),
6 cmake,7 cmake,
7 qtbase5-dev,8 qtbase5-dev,
@@ -9,9 +10,8 @@
9 libgtk-3-dev,10 libgtk-3-dev,
10 libmaliit-glib-dev,11 libmaliit-glib-dev,
11Standards-Version: 3.9.612Standards-Version: 3.9.6
12Homepage: https://launchpad.net/maliit-inputcontext-gtk13Vcs-Bzr: http://bazaar.launchpad.net/~attente/maliit-inputcontext-gtk/trunk
13#Vcs-Git: git://anonscm.debian.org/collab-maint/maliit-inputcontext-gtk.git14Vcs-Browser: https://code.launchpad.net/~attente/maliit-inputcontext-gtk/trunk
14#Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/maliit-inputcontext-gtk.git;a=summary
1515
16Package: maliit-inputcontext-gtk216Package: maliit-inputcontext-gtk2
17Architecture: any17Architecture: any
1818
=== modified file 'debian/rules'
--- debian/rules 2016-01-13 17:00:22 +0000
+++ debian/rules 2016-01-14 11:39:37 +0000
@@ -16,8 +16,6 @@
16# package maintainers to append LDFLAGS16# package maintainers to append LDFLAGS
17#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed17#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
1818
19.PHONY: get-orig-source get-packaged-orig-source
20
21# main packaging script based on dh7 syntax19# main packaging script based on dh7 syntax
22%:20%:
23 dh $@ 21 dh $@
@@ -39,3 +37,6 @@
39 dh_auto_configure -- \37 dh_auto_configure -- \
40 -DLIB_INSTALL_DIR=`pkg-config --variable=libdir gtk+-3.0` \38 -DLIB_INSTALL_DIR=`pkg-config --variable=libdir gtk+-3.0` \
41 -DENABLE_X11=ON39 -DENABLE_X11=ON
40
41#.PHONY: get-orig-source get-packaged-orig-source
42

Subscribers

People subscribed via source and target branches

to all changes: