kubuntu-packaging

Merge ~wxl/kubuntu-packaging/+git/kdiagram:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/kdiagram:kubuntu_unstable

  1. Git
  2. lp:~wxl/kubuntu-packaging/+git/kdiagram
  3. kubuntu_unstable
  4. Merge into kubuntu_unstable
Proposed by ԜаӀtеr Ⅼарсһуnѕkі
Status: Merged
Merged at revision: 3680758e52fede4d3794f411aeb05b0b7fcf9393
Proposed branch: ~wxl/kubuntu-packaging/+git/kdiagram:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/kdiagram:kubuntu_unstable
Diff against target: 99 lines (+16/-7)
5 files modified
debian/changelog (+5/-0)
debian/libkchart2.symbols (+2/-3)
debian/libkgantt-dev.install (+2/-2)
debian/libkgantt2.symbols (+3/-2)
debian/watch (+4/-0)
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+312853@code.launchpad.net

Description of the change

To resolve the immediate problem with
http://kci.pangea.pub/job/merger_kdiagram/
I updated libkgantt-dev.install for *QchTargets which was changed from QCHTargets.

Along the way, I added a watch file and updated the symbols. I ended up with three missing symbols:
 * vtable for KChart::BarDiagram::BarDiagramType
 * vtable for KChart::LineDiagram::LineDiagramType
 * KGantt::GraphicsScene::clearConstraintItems()
but it was suggested to me by Rik to just remove them since there is no released binary through Debian or Ubuntu yet and since my C++ isn't great, so it was difficult to judge. For example, regarding the latter, it appears to be a public member in a public header but may (?) be used in a private instance. I'm not sure.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index f44e03a..75389fa 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -6,4 +6,9 @@ kdiagram (2.6.0-1ubuntu1) UNRELEASED; urgency=medium
6 [ Rik Mills ]
7 * Install additional cmake files
8
9+ [ Walter Lapchynski ]
10+ * added debian/watch
11+ * updated libkgantt-dev.install for QchTargets
12+ * updated symbols
13+
14 -- Clive Johnston <clivejo@kubuntu.org> Wed, 03 Aug 2016 22:59:21 +0100
15diff --git a/debian/libkchart2.symbols b/debian/libkchart2.symbols
16index 993fe06..c916626 100644
17--- a/debian/libkchart2.symbols
18+++ b/debian/libkchart2.symbols
19@@ -1,4 +1,4 @@
20-# SymbolsHelper-Confirmed: 2.6.0 amd64
21+# SymbolsHelper-Confirmed: 2.6.0+git20161207 amd64
22 libKChart.so.2 libkchart2 #MINVER#
23 _ZN10QByteArray7reserveEi@Base 2.6.0
24 _ZN11KChartEnums11qt_metacallEN11QMetaObject4CallEiPPv@Base 2.6.0
25@@ -177,6 +177,7 @@ libKChart.so.2 libkchart2 #MINVER#
26 _ZN6KChart12AbstractAxis6updateEv@Base 2.6.0
27 _ZN6KChart12AbstractAxis7Private10setDiagramEPNS_15AbstractDiagramEb@Base 2.6.0
28 _ZN6KChart12AbstractAxis7Private12unsetDiagramEPNS_15AbstractDiagramE@Base 2.6.0
29+ _ZN6KChart12AbstractAxis7Private13updateLayoutsEv@Base 2.6.0+git20161207
30 _ZN6KChart12AbstractAxis7PrivateC1EPNS_15AbstractDiagramEPS0_@Base 2.6.0
31 _ZN6KChart12AbstractAxis7PrivateC2EPNS_15AbstractDiagramEPS0_@Base 2.6.0
32 _ZN6KChart12AbstractAxis7PrivateD0Ev@Base 2.6.0
33@@ -2424,12 +2425,10 @@ libKChart.so.2 libkchart2 #MINVER#
34 _ZTSN6KChart8TextArea7PrivateE@Base 2.6.0
35 _ZTSN6KChart8TextAreaE@Base 2.6.0
36 _ZTV11KChartEnums@Base 2.6.0
37- _ZTVN6KChart10BarDiagram14BarDiagramTypeE@Base 2.6.0
38 _ZTVN6KChart10BarDiagram7PrivateE@Base 2.6.0
39 _ZTVN6KChart10BarDiagramE@Base 2.6.0
40 _ZTVN6KChart10PieDiagram7PrivateE@Base 2.6.0
41 _ZTVN6KChart10PieDiagramE@Base 2.6.0
42- _ZTVN6KChart11LineDiagram15LineDiagramTypeE@Base 2.6.0
43 _ZTVN6KChart11LineDiagram7PrivateE@Base 2.6.0
44 _ZTVN6KChart11LineDiagramE@Base 2.6.0
45 _ZTVN6KChart11RingDiagram7PrivateE@Base 2.6.0
46diff --git a/debian/libkgantt-dev.install b/debian/libkgantt-dev.install
47index 2d616b4..9f68b51 100644
48--- a/debian/libkgantt-dev.install
49+++ b/debian/libkgantt-dev.install
50@@ -40,10 +40,10 @@ usr/include/KGantt/kganttsummaryhandlingproxymodel.h
51 usr/include/KGantt/kgantttreeviewrowcontroller.h
52 usr/include/KGantt/kganttview.h
53 usr/include/kgantt_version.h
54-usr/lib/*/cmake/KChart/KChartQCHTargets.cmake
55+usr/lib/*/cmake/KChart/KChartQchTargets.cmake
56 usr/lib/*/cmake/KGantt/KGanttConfig.cmake
57 usr/lib/*/cmake/KGantt/KGanttConfigVersion.cmake
58-usr/lib/*/cmake/KGantt/KGanttQCHTargets.cmake
59+usr/lib/*/cmake/KGantt/KGanttQchTargets.cmake
60 usr/lib/*/cmake/KGantt/KGanttTargets-debian.cmake
61 usr/lib/*/cmake/KGantt/KGanttTargets.cmake
62 usr/lib/*/libKGantt.so
63diff --git a/debian/libkgantt2.symbols b/debian/libkgantt2.symbols
64index b4f868a..e0f9a41 100644
65--- a/debian/libkgantt2.symbols
66+++ b/debian/libkgantt2.symbols
67@@ -1,4 +1,4 @@
68-# SymbolsHelper-Confirmed: 2.6.0 amd64
69+# SymbolsHelper-Confirmed: 2.6.0+git20161207 amd64
70 libKGantt.so.2 libkgantt2 #MINVER#
71 _ZN4KDAB8UnitTest12TestRegistry14deleteInstanceEv@Base 2.6.0
72 _ZN4KDAB8UnitTest12TestRegistry19registerTestFactoryEPKNS0_11TestFactoryEPKc@Base 2.6.0
73@@ -183,7 +183,6 @@ libKGantt.so.2 libkgantt2 #MINVER#
74 _ZN6KGantt13GraphicsScene17setSelectionModelEP19QItemSelectionModel@Base 2.6.0
75 _ZN6KGantt13GraphicsScene18setConstraintModelEPNS_15ConstraintModelE@Base 2.6.0
76 _ZN6KGantt13GraphicsScene19slotConstraintAddedERKNS_10ConstraintE@Base 2.6.0
77- _ZN6KGantt13GraphicsScene20clearConstraintItemsEv@Base 2.6.0
78 _ZN6KGantt13GraphicsScene21slotConstraintRemovedERKNS_10ConstraintE@Base 2.6.0
79 _ZN6KGantt13GraphicsScene23setSummaryHandlingModelEP19QAbstractProxyModel@Base 2.6.0
80 _ZN6KGantt13GraphicsScene4initEv@Base 2.6.0
81@@ -191,6 +190,8 @@ libKGantt.so.2 libkgantt2 #MINVER#
82 _ZN6KGantt13GraphicsScene5printEP8QPainterddRK6QRectFbb@Base 2.6.0
83 _ZN6KGantt13GraphicsScene5printEP8QPrinterbb@Base 2.6.0
84 _ZN6KGantt13GraphicsScene5printEP8QPrinterddbb@Base 2.6.0
85+ _ZN6KGantt13GraphicsScene7Private10clearItemsEv@Base 2.6.0+git20161207
86+ _ZN6KGantt13GraphicsScene7Private20clearConstraintItemsEv@Base 2.6.0+git20161207
87 _ZN6KGantt13GraphicsScene7Private20createConstraintItemERKNS_10ConstraintE@Base 2.6.0
88 _ZN6KGantt13GraphicsScene7Private20deleteConstraintItemEPNS_22ConstraintGraphicsItemE@Base 2.6.0
89 _ZN6KGantt13GraphicsScene7Private20deleteConstraintItemERKNS_10ConstraintE@Base 2.6.0
90diff --git a/debian/watch b/debian/watch
91new file mode 100644
92index 0000000..d0a601c
93--- /dev/null
94+++ b/debian/watch
95@@ -0,0 +1,4 @@
96+version=3
97+
98+opts=uversionmangle=s/-/~/ \
99+http://download.kde.org/stable/kdiagram/([\d.]+)/src/kdiagram-(.*).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

Subscribers

People subscribed via source and target branches