[SCM] audiocd-kio packaging branch, master, updated. debian/16.08.3-1-27-gbdc960c

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:19:12 UTC 2017 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/audiocd-kio.git;a=commitdiff;h=0ef88ec

The following commit has been merged in the master branch:
commit 0ef88ecf6775941a6ef7430787c38fe148193ca2
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Dec 14 18:11:05 2016 +0000

    wrap-and-sort
---
 debian/changelog                     |  2 +-
 debian/control                       | 43 +++++++----------------------
 debian/kio-audiocd-dev.acc           | 16 -----------
 debian/kio-audiocd-dev.install       |  3 ++-
 debian/kio-audiocd.install           | 27 +++++++------------
 debian/kio-audiocd.lintian-overrides |  2 +-
 debian/kio-audiocd.symbols           |  3 ---
 debian/rules                         |  9 +++----
 debian/upstream/signing-key.asc      | 52 ++++++++++++++++++++++++++++++++++++
 debian/watch                         |  4 +--
 10 files changed, 80 insertions(+), 81 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a553fea..9fbde2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-audiocd-kio (4:16.04.1-0neon) xenial; urgency=medium
+audiocd-kio (4:16.12.0-0neon) xenial; urgency=medium
 
   * New release
 
diff --git a/debian/control b/debian/control
index 209228a..212f65f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,16 @@ Uploaders: Pino Toscano <pino at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev,
+               extra-cmake-modules,
                libcdparanoia-dev,
                libflac-dev,
-               libkcddb-dev (>= 4:4.11),
-               libkcompactdisc-dev (>= 4:4.11),
+               libkf5cddb-dev,
+               libkf5compactdisc-dev,
+               libkf5config-dev,
+               libkf5doctools-dev,
+               libkf5i18n-dev,
+               libkf5kdelibs4support-dev,
+               libkf5kio-dev,
                libogg-dev,
                libvorbis-dev,
                pkg-kde-tools (>= 0.12)
@@ -24,9 +28,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/audiocd-kio.git
 Package: kio-audiocd
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: lame
-Breaks: kdemultimedia-kio-plugins (<< 4:4.10)
-Replaces: kdemultimedia-kio-plugins (<< 4:4.10)
+Recommends: lame
 Description: transparent audio CD access for applications using the KDE Platform
  This package includes the audiocd KIO plugin, which allows applications using
  the KDE Platform to read audio from CDs and automatically convert it into other
@@ -37,34 +39,9 @@ Description: transparent audio CD access for applications using the KDE Platform
 Package: kio-audiocd-dev
 Section: devel
 Architecture: any
-Depends: kio-audiocd (= ${binary:Version}),
-         ${misc:Depends},
-         ${sameVersionDep:kdelibs5-dev:kio-audiocd}
-Breaks: kdemultimedia-dev (<< 4:4.10)
-Replaces: kdemultimedia-dev (<< 4:4.10)
+Depends: kio-audiocd (= ${binary:Version}), ${misc:Depends}
 Description: development files for the audio CD KIO plugin
  This package contains development files for building plugins for the audio CD
  KIO plugin.
  .
  This package is part of the KDE multimedia module.
-
-Package: kdemultimedia-kio-plugins
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: kio-audiocd, ${misc:Depends}
-Description: transitional package for kio-audiocd
- This transitional package allows one to migrate to kio-audiocd.
- .
- It can be safely removed after the installation.
-
-Package: kdemultimedia-dev
-Section: oldlibs
-Priority: extra
-Architecture: all
-Depends: kio-audiocd-dev, libkcddb-dev, libkcompactdisc-dev, ${misc:Depends}
-Description: transitional package for KDE multimedia development packages
- This transitional package allows one to migrate to kio-audiocd-dev,
- libkcddb-dev, and libkcompactdisc-dev.
- .
- It can be safely removed after the installation.
diff --git a/debian/kio-audiocd-dev.acc b/debian/kio-audiocd-dev.acc
deleted file mode 100644
index ae1d5da..0000000
--- a/debian/kio-audiocd-dev.acc
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
-    4.11.3
-</version>
-
-<headers>
-    /usr/include/audiocdencoder.h
-</headers>
-
-<libs>
-    /usr/lib/libaudiocdplugins.so
-</libs>
-
-</descriptor>
diff --git a/debian/kio-audiocd-dev.install b/debian/kio-audiocd-dev.install
index 8a00e5d..79ba53b 100644
--- a/debian/kio-audiocd-dev.install
+++ b/debian/kio-audiocd-dev.install
@@ -1,2 +1,3 @@
 usr/include/audiocdencoder.h
-usr/lib/libaudiocdplugins.so
+usr/include/audiocdplugins_export.h
+usr/lib/x86_64-linux-gnu/libaudiocdplugins.so
diff --git a/debian/kio-audiocd.install b/debian/kio-audiocd.install
index c6ecc0d..45f801f 100644
--- a/debian/kio-audiocd.install
+++ b/debian/kio-audiocd.install
@@ -1,18 +1,9 @@
-usr/lib/kde4/kcm_audiocd.so
-usr/lib/kde4/kio_audiocd.so
-usr/lib/kde4/libaudiocd_encoder_flac.so
-usr/lib/kde4/libaudiocd_encoder_lame.so
-usr/lib/kde4/libaudiocd_encoder_vorbis.so
-usr/lib/kde4/libaudiocd_encoder_wav.so
-usr/lib/libaudiocdplugins.so.4
-usr/lib/libaudiocdplugins.so.4.*
-usr/share/doc/kde/HTML/en/kioslave/audiocd/common
-usr/share/doc/kde/HTML/en/kioslave/audiocd/index.cache.bz2
-usr/share/doc/kde/HTML/en/kioslave/audiocd/index.docbook
-usr/share/kde4/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
-usr/share/kde4/apps/solid/actions/solid_audiocd.desktop
-usr/share/kde4/config.kcfg/audiocd_flac_encoder.kcfg
-usr/share/kde4/config.kcfg/audiocd_lame_encoder.kcfg
-usr/share/kde4/config.kcfg/audiocd_vorbis_encoder.kcfg
-usr/share/kde4/services/audiocd.desktop
-usr/share/kde4/services/audiocd.protocol
+usr/lib/*/libaudiocdplugins.so.5
+usr/lib/*/libaudiocdplugins.so.5.*
+usr/lib/*/qt5/plugins/
+usr/share/config.kcfg/
+usr/share/doc/HTML/en/kioslave5/audiocd/
+usr/share/konqsidebartng/virtual_folders/services/audiocd.desktop
+usr/share/kservices5/audiocd.desktop
+usr/share/kservices5/audiocd.protocol
+usr/share/solid/actions/solid_audiocd.desktop
diff --git a/debian/kio-audiocd.lintian-overrides b/debian/kio-audiocd.lintian-overrides
index 0bf0c81..2c1ae31 100644
--- a/debian/kio-audiocd.lintian-overrides
+++ b/debian/kio-audiocd.lintian-overrides
@@ -1 +1 @@
-kio-audiocd: package-name-doesnt-match-sonames libaudiocdplugins4
+kio-audiocd: package-name-doesnt-match-sonames libaudiocdplugins5
diff --git a/debian/kio-audiocd.symbols b/debian/kio-audiocd.symbols
deleted file mode 100644
index 76a0624..0000000
--- a/debian/kio-audiocd.symbols
+++ /dev/null
@@ -1,3 +0,0 @@
-# SymbolsHelper-Confirmed: 4:4.4.5 alpha amd64 armel hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc
-libaudiocdplugins.so.4 kio-audiocd #MINVER#
- _ZN14AudioCDEncoder14findAllPluginsEPN3KIO9SlaveBaseER5QListIPS_E at Base 4:4.4.5
diff --git a/debian/rules b/debian/rules
index 07778b4..b887671 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +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_makeshlibs:
-	$(overridden_command) -V
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='kio-audiocd-dbg (<= 4:15.12.2-2~1.gbpa0d28f~)'
+override_dh_auto_test:
+	:
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..eeba72e
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+hC+sXh0NMOq4pxE=
+=Wqdv
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index a4dc9fd..6bc90cf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/audiocd-kio-([\d.]+).tar.xz
+version=4
+opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/applications/([\d.]+)/src/audiocd-kio-([\d.]+).tar.xz

-- 
audiocd-kio packaging

More information about the pkg-kde-commits mailing list