Walter Lapchynski has proposed merging ~wxl/kubuntu-packaging/+git/kdiagram:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/kdiagram:kubuntu_unstable.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~wxl/kubuntu-packaging/+git/kdiagram/+merge/312853 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. -- Your team Kubuntu Packagers is requested to review the proposed merge of ~wxl/kubuntu-packaging/+git/kdiagram:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/kdiagram:kubuntu_unstable.
diff --git a/debian/changelog b/debian/changelog index f44e03a..75389fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,4 +6,9 @@ kdiagram (2.6.0-1ubuntu1) UNRELEASED; urgency=medium [ Rik Mills ] * Install additional cmake files + [ Walter Lapchynski ] + * added debian/watch + * updated libkgantt-dev.install for QchTargets + * updated symbols + -- Clive Johnston <cliv...@kubuntu.org> Wed, 03 Aug 2016 22:59:21 +0100 diff --git a/debian/libkchart2.symbols b/debian/libkchart2.symbols index 993fe06..c916626 100644 --- a/debian/libkchart2.symbols +++ b/debian/libkchart2.symbols @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 2.6.0 amd64 +# SymbolsHelper-Confirmed: 2.6.0+git20161207 amd64 libKChart.so.2 libkchart2 #MINVER# _ZN10QByteArray7reserveEi@Base 2.6.0 _ZN11KChartEnums11qt_metacallEN11QMetaObject4CallEiPPv@Base 2.6.0 @@ -177,6 +177,7 @@ libKChart.so.2 libkchart2 #MINVER# _ZN6KChart12AbstractAxis6updateEv@Base 2.6.0 _ZN6KChart12AbstractAxis7Private10setDiagramEPNS_15AbstractDiagramEb@Base 2.6.0 _ZN6KChart12AbstractAxis7Private12unsetDiagramEPNS_15AbstractDiagramE@Base 2.6.0 + _ZN6KChart12AbstractAxis7Private13updateLayoutsEv@Base 2.6.0+git20161207 _ZN6KChart12AbstractAxis7PrivateC1EPNS_15AbstractDiagramEPS0_@Base 2.6.0 _ZN6KChart12AbstractAxis7PrivateC2EPNS_15AbstractDiagramEPS0_@Base 2.6.0 _ZN6KChart12AbstractAxis7PrivateD0Ev@Base 2.6.0 @@ -2424,12 +2425,10 @@ libKChart.so.2 libkchart2 #MINVER# _ZTSN6KChart8TextArea7PrivateE@Base 2.6.0 _ZTSN6KChart8TextAreaE@Base 2.6.0 _ZTV11KChartEnums@Base 2.6.0 - _ZTVN6KChart10BarDiagram14BarDiagramTypeE@Base 2.6.0 _ZTVN6KChart10BarDiagram7PrivateE@Base 2.6.0 _ZTVN6KChart10BarDiagramE@Base 2.6.0 _ZTVN6KChart10PieDiagram7PrivateE@Base 2.6.0 _ZTVN6KChart10PieDiagramE@Base 2.6.0 - _ZTVN6KChart11LineDiagram15LineDiagramTypeE@Base 2.6.0 _ZTVN6KChart11LineDiagram7PrivateE@Base 2.6.0 _ZTVN6KChart11LineDiagramE@Base 2.6.0 _ZTVN6KChart11RingDiagram7PrivateE@Base 2.6.0 diff --git a/debian/libkgantt-dev.install b/debian/libkgantt-dev.install index 2d616b4..9f68b51 100644 --- a/debian/libkgantt-dev.install +++ b/debian/libkgantt-dev.install @@ -40,10 +40,10 @@ usr/include/KGantt/kganttsummaryhandlingproxymodel.h usr/include/KGantt/kgantttreeviewrowcontroller.h usr/include/KGantt/kganttview.h usr/include/kgantt_version.h -usr/lib/*/cmake/KChart/KChartQCHTargets.cmake +usr/lib/*/cmake/KChart/KChartQchTargets.cmake usr/lib/*/cmake/KGantt/KGanttConfig.cmake usr/lib/*/cmake/KGantt/KGanttConfigVersion.cmake -usr/lib/*/cmake/KGantt/KGanttQCHTargets.cmake +usr/lib/*/cmake/KGantt/KGanttQchTargets.cmake usr/lib/*/cmake/KGantt/KGanttTargets-debian.cmake usr/lib/*/cmake/KGantt/KGanttTargets.cmake usr/lib/*/libKGantt.so diff --git a/debian/libkgantt2.symbols b/debian/libkgantt2.symbols index b4f868a..e0f9a41 100644 --- a/debian/libkgantt2.symbols +++ b/debian/libkgantt2.symbols @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 2.6.0 amd64 +# SymbolsHelper-Confirmed: 2.6.0+git20161207 amd64 libKGantt.so.2 libkgantt2 #MINVER# _ZN4KDAB8UnitTest12TestRegistry14deleteInstanceEv@Base 2.6.0 _ZN4KDAB8UnitTest12TestRegistry19registerTestFactoryEPKNS0_11TestFactoryEPKc@Base 2.6.0 @@ -183,7 +183,6 @@ libKGantt.so.2 libkgantt2 #MINVER# _ZN6KGantt13GraphicsScene17setSelectionModelEP19QItemSelectionModel@Base 2.6.0 _ZN6KGantt13GraphicsScene18setConstraintModelEPNS_15ConstraintModelE@Base 2.6.0 _ZN6KGantt13GraphicsScene19slotConstraintAddedERKNS_10ConstraintE@Base 2.6.0 - _ZN6KGantt13GraphicsScene20clearConstraintItemsEv@Base 2.6.0 _ZN6KGantt13GraphicsScene21slotConstraintRemovedERKNS_10ConstraintE@Base 2.6.0 _ZN6KGantt13GraphicsScene23setSummaryHandlingModelEP19QAbstractProxyModel@Base 2.6.0 _ZN6KGantt13GraphicsScene4initEv@Base 2.6.0 @@ -191,6 +190,8 @@ libKGantt.so.2 libkgantt2 #MINVER# _ZN6KGantt13GraphicsScene5printEP8QPainterddRK6QRectFbb@Base 2.6.0 _ZN6KGantt13GraphicsScene5printEP8QPrinterbb@Base 2.6.0 _ZN6KGantt13GraphicsScene5printEP8QPrinterddbb@Base 2.6.0 + _ZN6KGantt13GraphicsScene7Private10clearItemsEv@Base 2.6.0+git20161207 + _ZN6KGantt13GraphicsScene7Private20clearConstraintItemsEv@Base 2.6.0+git20161207 _ZN6KGantt13GraphicsScene7Private20createConstraintItemERKNS_10ConstraintE@Base 2.6.0 _ZN6KGantt13GraphicsScene7Private20deleteConstraintItemEPNS_22ConstraintGraphicsItemE@Base 2.6.0 _ZN6KGantt13GraphicsScene7Private20deleteConstraintItemERKNS_10ConstraintE@Base 2.6.0 diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..d0a601c --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=3 + +opts=uversionmangle=s/-/~/ \ +http://download.kde.org/stable/kdiagram/([\d.]+)/src/kdiagram-(.*).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
-- kubuntu-devel mailing list kubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
