[SCM] libkmahjongg packaging branch, kubuntu_vivid_archive, updated. debian/14.12.2-1-1-g9d962ad
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Mon Mar 9 14:57:05 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkmahjongg.git;a=commitdiff;h=9d962ad
The following commit has been merged in the kubuntu_vivid_archive branch:
commit 9d962ad142f0236a5dd41e3a9591f7a680011d44
Author: Harald Sitter <sitter at kde.org>
Date: Tue Mar 3 13:23:03 2015 +0100
kde frameworks 5 port
---
debian/changelog | 9 ++++
debian/control | 31 ++++++-------
debian/kdegames-mahjongg-data-kf5.install | 1 +
debian/kdegames-mahjongg-data.install | 1 -
debian/libkf5kmahjongglib-dev.install | 3 ++
...ibkmahjongglib4.acc => libkf5kmahjongglib5.acc} | 0
debian/libkf5kmahjongglib5.install | 2 +
debian/libkf5kmahjongglib5.symbols | 54 ++++++++++++++++++++++
debian/libkmahjongglib-dev.install | 2 -
debian/libkmahjongglib4.install | 2 -
debian/libkmahjongglib4.symbols | 53 ---------------------
debian/rules | 5 +-
12 files changed, 87 insertions(+), 76 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 04a5539..fb87e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libkmahjongg (4:14.12.50-0ubuntu1) UNRELEASED; urgency=medium
+
+ * KDE Frameworks 5 port
+ + Rename all libraries to match new sonames
+ + Give the data package a kf5 suffix as to not conflict with
+ the kdelibs4 version which has different paths but the same assets
+
+ -- Harald Sitter <sitter at kde.org> Tue, 03 Mar 2015 13:15:12 +0100
+
libkmahjongg (4:14.12.2-1) experimental; urgency=medium
* New upstream release (14.12.2).
diff --git a/debian/control b/debian/control
index 10a79c1..6247b90 100644
--- a/debian/control
+++ b/debian/control
@@ -12,52 +12,51 @@ Uploaders: Daniel Schepler <schepler at debian.org>,
Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake,
debhelper (>= 9),
- kde-sc-dev-latest (>= 4:4.11),
- kdelibs5-dev (>= 4:4.14),
- libkdegames-dev (>= 4:14.12.2),
- pkg-kde-tools (>= 0.14)
+ extra-cmake-modules (>= 1.3.0),
+ libkf5completion-dev,
+ libkf5config-dev,
+ libkf5configwidgets-dev,
+ libkf5coreaddons-dev,
+ libkf5i18n-dev,
+ libqt5svg5-dev (>= 5.2.0),
+ pkg-kde-tools (>= 0.14),
+ qtbase5-dev (>= 5.2.0)
Standards-Version: 3.9.6
XS-Testsuite: autopkgtest
Homepage: http://games.kde.org/
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/libkmahjongg.git
Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/libkmahjongg.git
-Package: libkmahjongglib4
+Package: libkf5kmahjongglib5
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: libkdegames5
-Breaks: libkdegames5
Description: shared library for kmahjongg and kshisen
This package contains a shared library used by the KDE games kmahjongg and
kshisen.
.
This package is part of the KDE games module.
-Package: libkmahjongglib-dev
+Package: libkf5kmahjongglib-dev
Section: libdevel
Architecture: any
-Depends: libkmahjongglib4 (= ${binary:Version}),
- ${misc:Depends},
- ${sameVersionDep:kdelibs5-dev:libkmahjongglib4}
+Depends: libkf5kmahjongglib5 (= ${binary:Version}), ${misc:Depends}
Description: development files for the KDE kmahjongg library
This package contains development files for building software that uses
the KDE kmahjongg library.
.
This package is part of the KDE games module.
-Package: libkmahjongglib4-dbg
+Package: libkf5kmahjongglib-dbg
Architecture: any
Priority: extra
Section: debug
-Depends: kde-runtime-dbg,
- libkmahjongglib4 (= ${binary:Version}),
- ${misc:Depends}
+Depends: libkf5kmahjongglib5 (= ${binary:Version}), ${misc:Depends}
Description: debugging symbols for the KDE kmahjongg library
This package contains the debugging symbols of the KDE kmahjongg library.
.
This package is part of the KDE games module.
-Package: kdegames-mahjongg-data
+Package: kdegames-mahjongg-data-kf5
Section: games
Architecture: all
Depends: ${misc:Depends}
diff --git a/debian/kdegames-mahjongg-data-kf5.install b/debian/kdegames-mahjongg-data-kf5.install
new file mode 100644
index 0000000..bd73f59
--- /dev/null
+++ b/debian/kdegames-mahjongg-data-kf5.install
@@ -0,0 +1 @@
+usr/share/kmahjongglib/*
diff --git a/debian/kdegames-mahjongg-data.install b/debian/kdegames-mahjongg-data.install
deleted file mode 100644
index 1919ba1..0000000
--- a/debian/kdegames-mahjongg-data.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/kde4/apps/kmahjongglib
diff --git a/debian/libkf5kmahjongglib-dev.install b/debian/libkf5kmahjongglib-dev.install
new file mode 100644
index 0000000..496fa31
--- /dev/null
+++ b/debian/libkf5kmahjongglib-dev.install
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/*/cmake/KF5KMahjongglib/*
+usr/lib/*/libKF5KMahjongglib.so
diff --git a/debian/libkmahjongglib4.acc b/debian/libkf5kmahjongglib5.acc
similarity index 100%
rename from debian/libkmahjongglib4.acc
rename to debian/libkf5kmahjongglib5.acc
diff --git a/debian/libkf5kmahjongglib5.install b/debian/libkf5kmahjongglib5.install
new file mode 100644
index 0000000..583991c
--- /dev/null
+++ b/debian/libkf5kmahjongglib5.install
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5KMahjongglib.so.5
+usr/lib/*/libKF5KMahjongglib.so.5.*.*
diff --git a/debian/libkf5kmahjongglib5.symbols b/debian/libkf5kmahjongglib5.symbols
new file mode 100644
index 0000000..04059ac
--- /dev/null
+++ b/debian/libkf5kmahjongglib5.symbols
@@ -0,0 +1,54 @@
+# SymbolsHelper-Confirmed: 4:14.12.50 amd64
+libKF5KMahjongglib.so.5 libkf5kmahjongglib5 #MINVER#
+ _ZN16KMahjonggTileset11loadDefaultEv at Base 4:14.12.50
+ _ZN16KMahjonggTileset11loadTilesetERK7QString at Base 4:14.12.50
+ _ZN16KMahjonggTileset12loadGraphicsEv at Base 4:14.12.50
+ _ZN16KMahjonggTileset12selectedTileEi at Base 4:14.12.50
+ _ZN16KMahjonggTileset13reloadTilesetERK5QSize at Base 4:14.12.50
+ _ZN16KMahjonggTileset13renderElementEssRK7QString at Base 4:14.12.50
+ _ZN16KMahjonggTileset14unselectedTileEi at Base 4:14.12.50
+ _ZN16KMahjonggTileset15updateScaleInfoEss at Base 4:14.12.50
+ _ZN16KMahjonggTileset17preferredTileSizeERK5QSizeii at Base 4:14.12.50
+ _ZN16KMahjonggTileset19buildElementIdTableEv at Base 4:14.12.50
+ _ZN16KMahjonggTileset28pixmapCacheNameFromElementIdERK7QString at Base 4:14.12.50
+ _ZN16KMahjonggTileset8tilefaceEi at Base 4:14.12.50
+ _ZN16KMahjonggTilesetC1Ev at Base 4:14.12.50
+ _ZN16KMahjonggTilesetC2Ev at Base 4:14.12.50
+ _ZN16KMahjonggTilesetD1Ev at Base 4:14.12.50
+ _ZN16KMahjonggTilesetD2Ev at Base 4:14.12.50
+ _ZN19KMahjonggBackground11loadDefaultEv at Base 4:14.12.50
+ _ZN19KMahjonggBackground11sizeChangedEii at Base 4:14.12.50
+ _ZN19KMahjonggBackground12loadGraphicsEv at Base 4:14.12.50
+ _ZN19KMahjonggBackground13getBackgroundEv at Base 4:14.12.50
+ _ZN19KMahjonggBackground4loadERK7QStringss at Base 4:14.12.50
+ _ZN19KMahjonggBackgroundC1Ev at Base 4:14.12.50
+ _ZN19KMahjonggBackgroundC2Ev at Base 4:14.12.50
+ _ZN19KMahjonggBackgroundD1Ev at Base 4:14.12.50
+ _ZN19KMahjonggBackgroundD2Ev at Base 4:14.12.50
+ _ZN21KMahjonggConfigDialog11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:14.12.50
+ _ZN21KMahjonggConfigDialog11qt_metacastEPKc at Base 4:14.12.50
+ _ZN21KMahjonggConfigDialog14addTilesetPageEv at Base 4:14.12.50
+ _ZN21KMahjonggConfigDialog16staticMetaObjectE at Base 4:14.12.50
+ _ZN21KMahjonggConfigDialog17addBackgroundPageEv at Base 4:14.12.50
+ _ZN21KMahjonggConfigDialog20updateWidgetsDefaultEv at Base 4:14.12.50
+ _ZN21KMahjonggConfigDialogC1EP7QWidgetRK7QStringP15KConfigSkeleton at Base 4:14.12.50
+ _ZN21KMahjonggConfigDialogC2EP7QWidgetRK7QStringP15KConfigSkeleton at Base 4:14.12.50
+ _ZN21KMahjonggConfigDialogD0Ev at Base 4:14.12.50
+ _ZN21KMahjonggConfigDialogD1Ev at Base 4:14.12.50
+ _ZN21KMahjonggConfigDialogD2Ev at Base 4:14.12.50
+ (optional=templinst)_ZNK12KConfigGroup9readEntryIiEET_PKcRKS1_ at Base 4:14.12.50
+ _ZNK16KMahjonggTileset12levelOffsetXEv at Base 4:14.12.50
+ _ZNK16KMahjonggTileset12levelOffsetYEv at Base 4:14.12.50
+ _ZNK16KMahjonggTileset14authorPropertyERK7QString at Base 4:14.12.50
+ _ZNK16KMahjonggTileset4pathEv at Base 4:14.12.50
+ _ZNK16KMahjonggTileset5widthEv at Base 4:14.12.50
+ _ZNK16KMahjonggTileset6heightEv at Base 4:14.12.50
+ _ZNK16KMahjonggTileset6qWidthEv at Base 4:14.12.50
+ _ZNK16KMahjonggTileset7qHeightEv at Base 4:14.12.50
+ _ZNK19KMahjonggBackground14authorPropertyERK7QString at Base 4:14.12.50
+ _ZNK19KMahjonggBackground4pathEv at Base 4:14.12.50
+ _ZNK21KMahjonggConfigDialog10metaObjectEv at Base 4:14.12.50
+ _ZTI21KMahjonggConfigDialog at Base 4:14.12.50
+ _ZTS21KMahjonggConfigDialog at Base 4:14.12.50
+ _ZTV21KMahjonggConfigDialog at Base 4:14.12.50
+ (c++)"non-virtual thunk to KMahjonggConfigDialog::~KMahjonggConfigDialog()@Base" 4:14.12.50
diff --git a/debian/libkmahjongglib-dev.install b/debian/libkmahjongglib-dev.install
deleted file mode 100644
index 1537de1..0000000
--- a/debian/libkmahjongglib-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/*
-usr/lib/*.so
diff --git a/debian/libkmahjongglib4.install b/debian/libkmahjongglib4.install
deleted file mode 100644
index cd38897..0000000
--- a/debian/libkmahjongglib4.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libkmahjongglib.so.4
-usr/lib/libkmahjongglib.so.4.*
diff --git a/debian/libkmahjongglib4.symbols b/debian/libkmahjongglib4.symbols
deleted file mode 100644
index 54a1c6d..0000000
--- a/debian/libkmahjongglib4.symbols
+++ /dev/null
@@ -1,53 +0,0 @@
-# SymbolsHelper-Confirmed: 4:4.7.4 amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc
-libkmahjongglib.so.4 libkmahjongglib4 #MINVER#
- _ZN16KMahjonggTileset11loadDefaultEv at Base 4:4.6.2
- _ZN16KMahjonggTileset11loadTilesetERK7QString at Base 4:4.6.2
- _ZN16KMahjonggTileset12loadGraphicsEv at Base 4:4.6.2
- _ZN16KMahjonggTileset12selectedTileEi at Base 4:4.6.2
- _ZN16KMahjonggTileset13reloadTilesetERK5QSize at Base 4:4.6.2
- _ZN16KMahjonggTileset13renderElementEssRK7QString at Base 4:4.6.2
- _ZN16KMahjonggTileset14unselectedTileEi at Base 4:4.6.2
- _ZN16KMahjonggTileset15updateScaleInfoEss at Base 4:4.6.2
- _ZN16KMahjonggTileset17preferredTileSizeERK5QSizeii at Base 4:4.6.2
- _ZN16KMahjonggTileset19buildElementIdTableEv at Base 4:4.6.2
- _ZN16KMahjonggTileset28pixmapCacheNameFromElementIdERK7QString at Base 4:4.6.2
- _ZN16KMahjonggTileset8tilefaceEi at Base 4:4.6.2
- _ZN16KMahjonggTilesetC1Ev at Base 4:4.6.2
- _ZN16KMahjonggTilesetC2Ev at Base 4:4.6.2
- _ZN16KMahjonggTilesetD1Ev at Base 4:4.6.2
- _ZN16KMahjonggTilesetD2Ev at Base 4:4.6.2
- _ZN19KMahjonggBackground11loadDefaultEv at Base 4:4.6.2
- _ZN19KMahjonggBackground11sizeChangedEii at Base 4:4.6.2
- _ZN19KMahjonggBackground12loadGraphicsEv at Base 4:4.6.2
- _ZN19KMahjonggBackground13getBackgroundEv at Base 4:4.6.2
- _ZN19KMahjonggBackground4loadERK7QStringss at Base 4:4.6.2
- _ZN19KMahjonggBackgroundC1Ev at Base 4:4.6.2
- _ZN19KMahjonggBackgroundC2Ev at Base 4:4.6.2
- _ZN19KMahjonggBackgroundD1Ev at Base 4:4.6.2
- _ZN19KMahjonggBackgroundD2Ev at Base 4:4.6.2
- _ZN21KMahjonggConfigDialog11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.6.2
- _ZN21KMahjonggConfigDialog11qt_metacastEPKc at Base 4:4.6.2
- _ZN21KMahjonggConfigDialog14addTilesetPageEv at Base 4:4.6.2
- _ZN21KMahjonggConfigDialog16staticMetaObjectE at Base 4:4.6.2
- _ZN21KMahjonggConfigDialog17addBackgroundPageEv at Base 4:4.6.2
- _ZN21KMahjonggConfigDialog20updateWidgetsDefaultEv at Base 4:4.6.2
- _ZN21KMahjonggConfigDialogC1EP7QWidgetRK7QStringP15KConfigSkeleton at Base 4:4.6.2
- _ZN21KMahjonggConfigDialogC2EP7QWidgetRK7QStringP15KConfigSkeleton at Base 4:4.6.2
- _ZN21KMahjonggConfigDialogD0Ev at Base 4:4.6.2
- _ZN21KMahjonggConfigDialogD1Ev at Base 4:4.6.2
- _ZN21KMahjonggConfigDialogD2Ev at Base 4:4.6.2
- _ZNK16KMahjonggTileset12levelOffsetXEv at Base 4:4.6.2
- _ZNK16KMahjonggTileset12levelOffsetYEv at Base 4:4.6.2
- _ZNK16KMahjonggTileset14authorPropertyERK7QString at Base 4:4.6.2
- _ZNK16KMahjonggTileset4pathEv at Base 4:4.6.2
- _ZNK16KMahjonggTileset5widthEv at Base 4:4.6.2
- _ZNK16KMahjonggTileset6heightEv at Base 4:4.6.2
- _ZNK16KMahjonggTileset6qWidthEv at Base 4:4.6.2
- _ZNK16KMahjonggTileset7qHeightEv at Base 4:4.6.2
- _ZNK19KMahjonggBackground14authorPropertyERK7QString at Base 4:4.6.2
- _ZNK19KMahjonggBackground4pathEv at Base 4:4.6.2
- _ZNK21KMahjonggConfigDialog10metaObjectEv at Base 4:4.6.2
- _ZTI21KMahjonggConfigDialog at Base 4:4.6.2
- _ZTS21KMahjonggConfigDialog at Base 4:4.6.2
- _ZTV21KMahjonggConfigDialog at Base 4:4.6.2
- (c++)"non-virtual thunk to KMahjonggConfigDialog::~KMahjonggConfigDialog()@Base" 4:4.6.2
diff --git a/debian/rules b/debian/rules
index 4e66736..56c421b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
override_dh_strip:
- $(overridden_command) --dbg-package=libkmahjongglib4-dbg
+ $(overridden_command) --dbg-package=libkf5kmahjongglib-dbg
--
libkmahjongg packaging
More information about the pkg-kde-commits
mailing list