Jose Manuel Santamaria Lema has proposed merging ~panfaust/kubuntu-packaging/+git/libksane:work into ~kubuntu-packagers/kubuntu-packaging/+git/libksane:kubuntu_yakkety_archive.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~panfaust/kubuntu-packaging/+git/libksane/+merge/302979 This merge request contains 2 commits, the first one corrects a problem similar to this one: https://code.launchpad.net/~panfaust/kubuntu-packaging/+git/libkipi/+merge/302962 Here in libksane are the misplaced files are usr/share/icons/hicolor/16x16/* So in addition to the problems already mentioned in the libpiki merge request (violates a 'must' policy, contradicts the lib packaging guide, makes the upgrades unneccesarily difficult), here in libksane also the misplaced files can break the multiarch installation because the files have the same name for any architecture so libkf5ksane5 couldn't be installed, for instance, for both amd64 and i386 in the same system. So I moved the files in question to a libkf5ksane-data package. That's the name of the package in debian's git master. In xenial there is already 'libksane-data', version '4:15.08.2-0ubuntu1' (note the epoch in the version) so I also made a dummy transitional package so the package managers will find more easily a solution for xenial->yakkety dist-upgrades, avoiding situations like this one: root@xdu-up-test:/home/santa# apt-get dist-upgrade Reading package lists... Done Building dependency tree Reading state information... Done Calculating upgrade... Done The following packages were automatically installed and are no longer required: [snip] Use 'sudo apt autoremove' to remove them. The following packages have been kept back: gir1.2-packagekitglib-1.0 python3-aptdaemon skanlite 0 upgraded, 0 newly installed, 0 to remove and 3 not upgraded. The change I made in the first commit in the debian/rules file is to add the epoch to the libksane-data dummy package and ONLY to that package; this way we don't have to add an epoch to the other packages so once yakkety is released we could remove both this change in the rules file and the dummy transitional package. The change I made in the second commit is just removing the exclusion of 'kde-runtime' when calling dh_shlibdeps, this exclusion was there to avoid undesired dependencies when libksane was still based on kdelibs 4; note that the libkdecore5 symbols file from kde4libs injects a dependency on kde-runtime. So now that libksane is based on KDE Frameworks that exclusion is no longer needed. -- Your team Kubuntu Packagers is requested to review the proposed merge of ~panfaust/kubuntu-packaging/+git/libksane:work into ~kubuntu-packagers/kubuntu-packaging/+git/libksane:kubuntu_yakkety_archive.
diff --git a/debian/changelog b/debian/changelog index da78194..d1d6e8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,10 +13,16 @@ libkf5sane (16.04.3-0ubuntu1) UNRELEASED; urgency=medium * New upstream bugfix release. [ Clive Johnston ] - * libkf5sane5 breaks/replaces libksane-data * New upstream release (16.04.2) * New upstream release (16.04.3) + [ José Manuel Santamaría Lema ] + * Install usr/share/icons/hicolor/16x16/* in libkf5sane-data + * Provide libksane-data dummy transitional package to make the upgrades + easier for the package managers. + * Remove dh_shlibdeps override to exclude kde-runtime; this is no + longer needed since the port to frameworks. + -- Clive Johnston <[email protected]> Fri, 08 Jul 2016 01:34:49 +0100 libkf5sane (15.12.3-0ubuntu1) xenial; urgency=medium diff --git a/debian/control b/debian/control index 6cfbc7a..03eb167 100644 --- a/debian/control +++ b/debian/control @@ -33,6 +33,27 @@ Description: scanner library (runtime) . This package contains the shared library. +Package: libkf5sane-data +Architecture: all +Depends: ${misc:Depends} +Breaks: libkf5sane5 (<= 16.04.3-0ubuntu1~ubuntu16.10~ppa50), + libksane-data (<= 16.04.3-0ubuntu1~ubuntu16.10~ppa50) +Replaces: libkf5sane5 (<= 16.04.3-0ubuntu1~ubuntu16.10~ppa50), + libksane-data (<= 16.04.3-0ubuntu1~ubuntu16.10~ppa50) +Description: scanner library (data files) + The KDE scanner library provides an API and widgets for using scanners and + other imaging devices supported by SANE. + . + This package contains data files used by the library. + +Package: libksane-data +Architecture: all +Section: oldlibs +Priority: extra +Depends: libkf5sane-data, ${misc:Depends} +Description: scanner library (data files) - transitional package + This is a transitional dummy package. It can safely be removed. + Package: libkf5sane-dev Section: libdevel Architecture: any diff --git a/debian/libkf5sane-data.install b/debian/libkf5sane-data.install new file mode 100644 index 0000000..5dda087 --- /dev/null +++ b/debian/libkf5sane-data.install @@ -0,0 +1 @@ +usr/share/icons/hicolor/16x16/* diff --git a/debian/libkf5sane5.install b/debian/libkf5sane5.install index 30e7449..e631579 100644 --- a/debian/libkf5sane5.install +++ b/debian/libkf5sane5.install @@ -1,3 +1,2 @@ usr/lib/*/libKF5Sane.so.5 usr/lib/*/libKF5Sane.so.5.* -usr/share/icons/hicolor/16x16/* diff --git a/debian/rules b/debian/rules index d8e4a0c..6c186f5 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk -override_dh_shlibdeps: - $(overridden_command) $(foreach p,$(shell dh_listpackages | grep ^lib),-p$p) -- -xkde-runtime - $(overridden_command) --remaining-packages +PACKAGE_VERSION = $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //') +override_dh_gencontrol: + dh_gencontrol -plibksane-data -- -v"4:${PACKAGE_VERSION}" + dh_gencontrol --remaining-packages
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
