Merge lp:~chasedouglas/kubuntu-packaging/touchegg-geis-rename into lp:~kubuntu-packagers/kubuntu-packaging/touchegg

Proposed by Chase Douglas
Status: Merged
Merged at revision: 8
Proposed branch: lp:~chasedouglas/kubuntu-packaging/touchegg-geis-rename
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/touchegg
Diff against target: 54 lines (+23/-2)
4 files modified
debian/changelog (+7/-0)
debian/control (+2/-2)
debian/patches/0001-geis_rename.patch (+13/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~chasedouglas/kubuntu-packaging/touchegg-geis-rename
Reviewer Review Type Date Requested Status
Scott Kitterman Approve
Review via email: mp+117350@code.launchpad.net

Description of the change

Depend on libgeis rather than libutouch-geis. The geis upstream project has been renamed.

To post a comment you must log in.
Revision history for this message
Scott Kitterman (kitterman) wrote :

Looks good.

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 2011-09-21 13:44:12 +0000
3+++ debian/changelog 2012-07-30 21:59:17 +0000
4@@ -1,3 +1,10 @@
5+touchegg (1.0-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * Depend on renamed geis package
8+ * Bump lintian standards version to 3.9.3
9+
10+ -- Chase Douglas <chase.douglas@ubuntu.com> Mon, 30 Jul 2012 14:51:05 -0700
11+
12 touchegg (1.0-0ubuntu1) oneiric; urgency=low
13
14 * New upstream release (LP: #855491)
15
16=== modified file 'debian/control'
17--- debian/control 2011-09-21 13:44:12 +0000
18+++ debian/control 2012-07-30 21:59:17 +0000
19@@ -3,8 +3,8 @@
20 Priority: optional
21 Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
22 Build-Depends: debhelper (>= 8.0.0), libqt4-dev,
23- libutouch-geis-dev, libx11-dev, libxtst-dev, libxext-dev
24-Standards-Version: 3.9.2
25+ libgeis-dev, libx11-dev, libxtst-dev, libxext-dev
26+Standards-Version: 3.9.3
27 Homepage: http://code.google.com/p/touchegg
28 Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/touchegg
29 Vcs-Bzr: lp:~kubuntu-packagers/kubuntu-packaging/touchegg
30
31=== added directory 'debian/patches'
32=== added file 'debian/patches/0001-geis_rename.patch'
33--- debian/patches/0001-geis_rename.patch 1970-01-01 00:00:00 +0000
34+++ debian/patches/0001-geis_rename.patch 2012-07-30 21:59:17 +0000
35@@ -0,0 +1,13 @@
36+Index: touchegg/touchegg.pro
37+===================================================================
38+--- touchegg.orig/touchegg.pro 2012-07-30 14:49:39.595064774 -0700
39++++ touchegg/touchegg.pro 2012-07-30 14:49:50.581568509 -0700
40+@@ -3,7 +3,7 @@
41+ QT += gui core xml
42+ OBJECTS_DIR += build
43+ MOC_DIR += build
44+-LIBS += -lutouch-geis -lX11 -lXtst -lXext
45++LIBS += -lgeis -lX11 -lXtst -lXext
46+ //DEFINES = QT_NO_DEBUG_OUTPUT
47+
48+ target.path = /usr/bin
49
50=== added file 'debian/patches/series'
51--- debian/patches/series 1970-01-01 00:00:00 +0000
52+++ debian/patches/series 2012-07-30 21:59:17 +0000
53@@ -0,0 +1,1 @@
54+0001-geis_rename.patch

Subscribers

People subscribed via source and target branches