Merge lp:~ampelbein/ubuntu/oneiric/libqtgtl/lp-766009 into lp:ubuntu/oneiric/libqtgtl

Proposed by Andreas Moog on 2011-06-26
Status: Merged
Merged at revision: 7
Proposed branch: lp:~ampelbein/ubuntu/oneiric/libqtgtl/lp-766009
Merge into: lp:ubuntu/oneiric/libqtgtl
Diff against target: 66 lines (+14/-6)
4 files modified
debian/changelog (+9/-0)
debian/control (+3/-2)
debian/libqtgtl0.substvars (+0/-2)
debian/libqtshiva0.1.symbols (+2/-2)
To merge this branch: bzr merge lp:~ampelbein/ubuntu/oneiric/libqtgtl/lp-766009
Reviewer Review Type Date Requested Status
Felix Geyer (community) 2011-06-26 Approve on 2011-06-29
Review via email: mp+65904@code.launchpad.net
To post a comment you must log in.
Felix Geyer (debfx) wrote :

Merged, 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 2011-01-15 01:24:04 +0000
3+++ debian/changelog 2011-06-26 16:45:57 +0000
4@@ -1,3 +1,12 @@
5+libqtgtl (0.9.1-0ubuntu5) oneiric; urgency=low
6+
7+ * Update symbols file to fix FTBFS. (LP: #766009)
8+ * don't include debian/libqtgtl0.substvars in diff.
9+ * Fix extended-description-line-too-long
10+ * Update standards version
11+
12+ -- Andreas Moog <amoog@ubuntu.com> Sun, 26 Jun 2011 16:33:15 +0000
13+
14 libqtgtl (0.9.1-0ubuntu4) natty; urgency=low
15
16 * Fix .symbols files
17
18=== modified file 'debian/control'
19--- debian/control 2010-06-21 13:05:41 +0000
20+++ debian/control 2011-06-26 16:45:57 +0000
21@@ -3,7 +3,7 @@
22 Section: devel
23 Maintainer: Richard A. Johnson <nixternal@ubuntu.com>
24 Build-Depends: debhelper (>= 7), cmake, libqt4-dev, opengtl-dev (>= 0.9.14), pkg-config
25-Standards-Version: 3.8.4
26+Standards-Version: 3.9.2
27 Homepage: http://www.opengtl.org/
28
29 Package: libqtgtl-dev
30@@ -37,5 +37,6 @@
31 libQtShiva is a library that provides widgets and classes to interface Qt-based
32 applications with OpenShiva.
33 .
34- Shiva is a programming language intented to transform an image by applying a kernel-like transformation.
35+ Shiva is a programming language intented to transform an image by applying a
36+ kernel-like transformation.
37
38
39=== removed file 'debian/libqtgtl0.substvars'
40--- debian/libqtgtl0.substvars 2010-06-21 13:05:41 +0000
41+++ debian/libqtgtl0.substvars 1970-01-01 00:00:00 +0000
42@@ -1,2 +0,0 @@
43-shlibs:Depends=libc6 (>= 2.1.3), libgcc1 (>= 1:4.1.1), libgtlcore0.7, libqtgui4 (>= 4:4.5.3), libstdc++6 (>= 4.1.1)
44-misc:Depends=
45
46=== modified file 'debian/libqtshiva0.1.symbols'
47--- debian/libqtshiva0.1.symbols 2011-01-15 01:24:04 +0000
48+++ debian/libqtshiva0.1.symbols 2011-06-26 16:45:57 +0000
49@@ -11,8 +11,6 @@
50 _Z8RGBToHSLfffPfS_S_@Base 0.9.1
51 _Z8RGBToHSVfffPfS_S_@Base 0.9.1
52 _Z9hue_valuefff@Base 0.9.1
53- _ZN10QByteArrayD1Ev@Base 0.9.1
54- _ZN10QByteArrayD2Ev@Base 0.9.1
55 _ZN12VectorEditor10setMaximumERK5QListIdE@Base 0.9.1
56 _ZN12VectorEditor10setMinimumERK5QListIdE@Base 0.9.1
57 _ZN12VectorEditor11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.9.1
58@@ -27,6 +25,8 @@
59 _ZN12VectorEditorD1Ev@Base 0.9.1
60 _ZN12VectorEditorD2Ev@Base 0.9.1
61 _ZN13Ui_RgbaDialog7setupUiEP7QDialog@Base 0.9.1
62+ _ZN17QForeachContainerIKSt4listIPKN7GTLCore8Metadata5EntryESaIS5_EEED1Ev@Base 0.9.1
63+ _ZN17QForeachContainerIKSt4listIPKN7GTLCore8Metadata5EntryESaIS5_EEED2Ev@Base 0.9.1
64 _ZN21TriangleColorSelector10paintEventEP11QPaintEvent@Base 0.9.1
65 _ZN21TriangleColorSelector11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.9.1
66 _ZN21TriangleColorSelector11qt_metacastEPKc@Base 0.9.1

Subscribers

People subscribed via source and target branches

to all changes: