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

Proposed by Andreas Moog
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) Approve
Review via email: mp+65904@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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
=== modified file 'debian/changelog'
--- debian/changelog 2011-01-15 01:24:04 +0000
+++ debian/changelog 2011-06-26 16:45:57 +0000
@@ -1,3 +1,12 @@
1libqtgtl (0.9.1-0ubuntu5) oneiric; urgency=low
2
3 * Update symbols file to fix FTBFS. (LP: #766009)
4 * don't include debian/libqtgtl0.substvars in diff.
5 * Fix extended-description-line-too-long
6 * Update standards version
7
8 -- Andreas Moog <amoog@ubuntu.com> Sun, 26 Jun 2011 16:33:15 +0000
9
1libqtgtl (0.9.1-0ubuntu4) natty; urgency=low10libqtgtl (0.9.1-0ubuntu4) natty; urgency=low
211
3 * Fix .symbols files12 * Fix .symbols files
413
=== modified file 'debian/control'
--- debian/control 2010-06-21 13:05:41 +0000
+++ debian/control 2011-06-26 16:45:57 +0000
@@ -3,7 +3,7 @@
3Section: devel3Section: devel
4Maintainer: Richard A. Johnson <nixternal@ubuntu.com>4Maintainer: Richard A. Johnson <nixternal@ubuntu.com>
5Build-Depends: debhelper (>= 7), cmake, libqt4-dev, opengtl-dev (>= 0.9.14), pkg-config5Build-Depends: debhelper (>= 7), cmake, libqt4-dev, opengtl-dev (>= 0.9.14), pkg-config
6Standards-Version: 3.8.46Standards-Version: 3.9.2
7Homepage: http://www.opengtl.org/7Homepage: http://www.opengtl.org/
88
9Package: libqtgtl-dev9Package: libqtgtl-dev
@@ -37,5 +37,6 @@
37 libQtShiva is a library that provides widgets and classes to interface Qt-based37 libQtShiva is a library that provides widgets and classes to interface Qt-based
38 applications with OpenShiva.38 applications with OpenShiva.
39 .39 .
40 Shiva is a programming language intented to transform an image by applying a kernel-like transformation.40 Shiva is a programming language intented to transform an image by applying a
41 kernel-like transformation.
4142
4243
=== removed file 'debian/libqtgtl0.substvars'
--- debian/libqtgtl0.substvars 2010-06-21 13:05:41 +0000
+++ debian/libqtgtl0.substvars 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1shlibs:Depends=libc6 (>= 2.1.3), libgcc1 (>= 1:4.1.1), libgtlcore0.7, libqtgui4 (>= 4:4.5.3), libstdc++6 (>= 4.1.1)
2misc:Depends=
30
=== modified file 'debian/libqtshiva0.1.symbols'
--- debian/libqtshiva0.1.symbols 2011-01-15 01:24:04 +0000
+++ debian/libqtshiva0.1.symbols 2011-06-26 16:45:57 +0000
@@ -11,8 +11,6 @@
11 _Z8RGBToHSLfffPfS_S_@Base 0.9.111 _Z8RGBToHSLfffPfS_S_@Base 0.9.1
12 _Z8RGBToHSVfffPfS_S_@Base 0.9.112 _Z8RGBToHSVfffPfS_S_@Base 0.9.1
13 _Z9hue_valuefff@Base 0.9.113 _Z9hue_valuefff@Base 0.9.1
14 _ZN10QByteArrayD1Ev@Base 0.9.1
15 _ZN10QByteArrayD2Ev@Base 0.9.1
16 _ZN12VectorEditor10setMaximumERK5QListIdE@Base 0.9.114 _ZN12VectorEditor10setMaximumERK5QListIdE@Base 0.9.1
17 _ZN12VectorEditor10setMinimumERK5QListIdE@Base 0.9.115 _ZN12VectorEditor10setMinimumERK5QListIdE@Base 0.9.1
18 _ZN12VectorEditor11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.9.116 _ZN12VectorEditor11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.9.1
@@ -27,6 +25,8 @@
27 _ZN12VectorEditorD1Ev@Base 0.9.125 _ZN12VectorEditorD1Ev@Base 0.9.1
28 _ZN12VectorEditorD2Ev@Base 0.9.126 _ZN12VectorEditorD2Ev@Base 0.9.1
29 _ZN13Ui_RgbaDialog7setupUiEP7QDialog@Base 0.9.127 _ZN13Ui_RgbaDialog7setupUiEP7QDialog@Base 0.9.1
28 _ZN17QForeachContainerIKSt4listIPKN7GTLCore8Metadata5EntryESaIS5_EEED1Ev@Base 0.9.1
29 _ZN17QForeachContainerIKSt4listIPKN7GTLCore8Metadata5EntryESaIS5_EEED2Ev@Base 0.9.1
30 _ZN21TriangleColorSelector10paintEventEP11QPaintEvent@Base 0.9.130 _ZN21TriangleColorSelector10paintEventEP11QPaintEvent@Base 0.9.1
31 _ZN21TriangleColorSelector11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.9.131 _ZN21TriangleColorSelector11qt_metacallEN11QMetaObject4CallEiPPv@Base 0.9.1
32 _ZN21TriangleColorSelector11qt_metacastEPKc@Base 0.9.132 _ZN21TriangleColorSelector11qt_metacastEPKc@Base 0.9.1

Subscribers

People subscribed via source and target branches

to all changes: