Rik Mills has proposed merging ~acheron/kubuntu-packaging/+git/kdesdk-kioslaves:kubuntu_yakkety_archive into ~kubuntu-packagers/kubuntu-packaging/+git/kdesdk-kioslaves:kubuntu_yakkety_archive.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~acheron/kubuntu-packaging/+git/kdesdk-kioslaves/+merge/298929 Merge with debian packaging and disable svn support as that has been broken for some time -- Your team Kubuntu Packagers is requested to review the proposed merge of ~acheron/kubuntu-packaging/+git/kdesdk-kioslaves:kubuntu_yakkety_archive into ~kubuntu-packagers/kubuntu-packaging/+git/kdesdk-kioslaves:kubuntu_yakkety_archive.
diff --git a/debian/changelog b/debian/changelog index 68a51f8..cadc5f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -kdesdk-kioslaves (4:16.04.2-0ubuntu1) UNRELEASED; urgency=medium +kdesdk-kioslaves (4:16.04.2-1ubuntu1) UNRELEASED; urgency=medium [ Clive Johnston ] * New upstream release @@ -14,6 +14,12 @@ kdesdk-kioslaves (4:16.04.2-0ubuntu1) UNRELEASED; urgency=medium * Switch to KF5 build * New upstream release (16.04.2) + [ Rik Mills ] + * Merge with debian packaging + * Disable svn support, it doesn't work with 1.9+ + Thanks to Chris Lamb for the report (Closes: debian bug 799525) + * Update install files + -- Clive Johnston <[email protected]> Fri, 24 Jun 2016 22:38:40 +0100 kdesdk-kioslaves (4:15.08.3-1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 74730ff..485f620 100644 --- a/debian/control +++ b/debian/control @@ -29,15 +29,3 @@ Description: transparent Subversion access and Perl documentation KIO slaves plugin, which can be used to browse the Perl documentation within Konqueror. . This package is part of the KDE Software Development Kit module. - -Package: kdesdk-kioslaves-dbg -Section: debug -Architecture: any -Priority: extra -Depends: kate-dbg, - kde-runtime-dbg, - kdesdk-kio-plugins (= ${binary:Version}), - ${misc:Depends} -Description: debugging symbols for kdesdk-kio-plugins - This package contains debugging files used to investigate problems with - binaries included in kdesdk-kio-plugins. diff --git a/debian/kdesdk-kio-plugins.install b/debian/kdesdk-kio-plugins.install index 667a462..426ca0d 100644 --- a/debian/kdesdk-kio-plugins.install +++ b/debian/kdesdk-kio-plugins.install @@ -1,57 +1,57 @@ -usr/bin/kio_svn_helper -usr/lib/kde4/kded_ksvnd.so +# usr/bin/kio_svn_helper +# usr/lib/kde4/kded_ksvnd.so usr/lib/kde4/kio_perldoc.so -usr/lib/kde4/kio_svn.so -usr/share/dbus-1/interfaces/org.kde.ksvnd.xml -usr/share/icons/hicolor/128x128/actions/vcs-add-svn-kiosvn.png -usr/share/icons/hicolor/128x128/actions/vcs-branch-svn-kiosvn.png -usr/share/icons/hicolor/128x128/actions/vcs-merge-svn-kiosvn.png -usr/share/icons/hicolor/128x128/actions/vcs-remove-svn-kiosvn.png -usr/share/icons/hicolor/128x128/actions/vcs-status-svn-kiosvn.png -usr/share/icons/hicolor/128x128/actions/vcs-switch-svn-kiosvn.png -usr/share/icons/hicolor/16x16/actions/vcs-add-svn-kiosvn.png -usr/share/icons/hicolor/16x16/actions/vcs-branch-svn-kiosvn.png -usr/share/icons/hicolor/16x16/actions/vcs-merge-svn-kiosvn.png -usr/share/icons/hicolor/16x16/actions/vcs-remove-svn-kiosvn.png -usr/share/icons/hicolor/16x16/actions/vcs-status-svn-kiosvn.png -usr/share/icons/hicolor/16x16/actions/vcs-switch-svn-kiosvn.png -usr/share/icons/hicolor/22x22/actions/vcs-add-svn-kiosvn.png -usr/share/icons/hicolor/22x22/actions/vcs-branch-svn-kiosvn.png -usr/share/icons/hicolor/22x22/actions/vcs-merge-svn-kiosvn.png -usr/share/icons/hicolor/22x22/actions/vcs-remove-svn-kiosvn.png -usr/share/icons/hicolor/22x22/actions/vcs-status-svn-kiosvn.png -usr/share/icons/hicolor/22x22/actions/vcs-switch-svn-kiosvn.png -usr/share/icons/hicolor/32x32/actions/vcs-add-svn-kiosvn.png -usr/share/icons/hicolor/32x32/actions/vcs-branch-svn-kiosvn.png -usr/share/icons/hicolor/32x32/actions/vcs-merge-svn-kiosvn.png -usr/share/icons/hicolor/32x32/actions/vcs-remove-svn-kiosvn.png -usr/share/icons/hicolor/32x32/actions/vcs-status-svn-kiosvn.png -usr/share/icons/hicolor/32x32/actions/vcs-switch-svn-kiosvn.png -usr/share/icons/hicolor/48x48/actions/vcs-add-svn-kiosvn.png -usr/share/icons/hicolor/48x48/actions/vcs-branch-svn-kiosvn.png -usr/share/icons/hicolor/48x48/actions/vcs-merge-svn-kiosvn.png -usr/share/icons/hicolor/48x48/actions/vcs-remove-svn-kiosvn.png -usr/share/icons/hicolor/48x48/actions/vcs-status-svn-kiosvn.png -usr/share/icons/hicolor/48x48/actions/vcs-switch-svn-kiosvn.png -usr/share/icons/hicolor/64x64/actions/vcs-add-svn-kiosvn.png -usr/share/icons/hicolor/64x64/actions/vcs-branch-svn-kiosvn.png -usr/share/icons/hicolor/64x64/actions/vcs-merge-svn-kiosvn.png -usr/share/icons/hicolor/64x64/actions/vcs-remove-svn-kiosvn.png -usr/share/icons/hicolor/64x64/actions/vcs-status-svn-kiosvn.png -usr/share/icons/hicolor/64x64/actions/vcs-switch-svn-kiosvn.png -usr/share/icons/hicolor/scalable/actions/vcs-add-svn-kiosvn.svgz -usr/share/icons/hicolor/scalable/actions/vcs-branch-svn-kiosvn.svgz -usr/share/icons/hicolor/scalable/actions/vcs-merge-svn-kiosvn.svgz -usr/share/icons/hicolor/scalable/actions/vcs-remove-svn-kiosvn.svgz -usr/share/icons/hicolor/scalable/actions/vcs-status-svn-kiosvn.svgz -usr/share/icons/hicolor/scalable/actions/vcs-switch-svn-kiosvn.svgz +# usr/lib/kde4/kio_svn.so +# usr/share/dbus-1/interfaces/org.kde.ksvnd.xml +# usr/share/icons/hicolor/128x128/actions/vcs-add-svn-kiosvn.png +# usr/share/icons/hicolor/128x128/actions/vcs-branch-svn-kiosvn.png +# usr/share/icons/hicolor/128x128/actions/vcs-merge-svn-kiosvn.png +# usr/share/icons/hicolor/128x128/actions/vcs-remove-svn-kiosvn.png +# usr/share/icons/hicolor/128x128/actions/vcs-status-svn-kiosvn.png +# usr/share/icons/hicolor/128x128/actions/vcs-switch-svn-kiosvn.png +# usr/share/icons/hicolor/16x16/actions/vcs-add-svn-kiosvn.png +# usr/share/icons/hicolor/16x16/actions/vcs-branch-svn-kiosvn.png +# usr/share/icons/hicolor/16x16/actions/vcs-merge-svn-kiosvn.png +# usr/share/icons/hicolor/16x16/actions/vcs-remove-svn-kiosvn.png +# usr/share/icons/hicolor/16x16/actions/vcs-status-svn-kiosvn.png +# usr/share/icons/hicolor/16x16/actions/vcs-switch-svn-kiosvn.png +# usr/share/icons/hicolor/22x22/actions/vcs-add-svn-kiosvn.png +# usr/share/icons/hicolor/22x22/actions/vcs-branch-svn-kiosvn.png +# usr/share/icons/hicolor/22x22/actions/vcs-merge-svn-kiosvn.png +# usr/share/icons/hicolor/22x22/actions/vcs-remove-svn-kiosvn.png +# usr/share/icons/hicolor/22x22/actions/vcs-status-svn-kiosvn.png +# usr/share/icons/hicolor/22x22/actions/vcs-switch-svn-kiosvn.png +# usr/share/icons/hicolor/32x32/actions/vcs-add-svn-kiosvn.png +# usr/share/icons/hicolor/32x32/actions/vcs-branch-svn-kiosvn.png +# usr/share/icons/hicolor/32x32/actions/vcs-merge-svn-kiosvn.png +# usr/share/icons/hicolor/32x32/actions/vcs-remove-svn-kiosvn.png +# usr/share/icons/hicolor/32x32/actions/vcs-status-svn-kiosvn.png +# usr/share/icons/hicolor/32x32/actions/vcs-switch-svn-kiosvn.png +# usr/share/icons/hicolor/48x48/actions/vcs-add-svn-kiosvn.png +# usr/share/icons/hicolor/48x48/actions/vcs-branch-svn-kiosvn.png +# usr/share/icons/hicolor/48x48/actions/vcs-merge-svn-kiosvn.png +# usr/share/icons/hicolor/48x48/actions/vcs-remove-svn-kiosvn.png +# usr/share/icons/hicolor/48x48/actions/vcs-status-svn-kiosvn.png +# usr/share/icons/hicolor/48x48/actions/vcs-switch-svn-kiosvn.png +# usr/share/icons/hicolor/64x64/actions/vcs-add-svn-kiosvn.png +# usr/share/icons/hicolor/64x64/actions/vcs-branch-svn-kiosvn.png +# usr/share/icons/hicolor/64x64/actions/vcs-merge-svn-kiosvn.png +# usr/share/icons/hicolor/64x64/actions/vcs-remove-svn-kiosvn.png +# usr/share/icons/hicolor/64x64/actions/vcs-status-svn-kiosvn.png +# usr/share/icons/hicolor/64x64/actions/vcs-switch-svn-kiosvn.png +# usr/share/icons/hicolor/scalable/actions/vcs-add-svn-kiosvn.svgz +# usr/share/icons/hicolor/scalable/actions/vcs-branch-svn-kiosvn.svgz +# usr/share/icons/hicolor/scalable/actions/vcs-merge-svn-kiosvn.svgz +# usr/share/icons/hicolor/scalable/actions/vcs-remove-svn-kiosvn.svgz +# usr/share/icons/hicolor/scalable/actions/vcs-status-svn-kiosvn.svgz +# usr/share/icons/hicolor/scalable/actions/vcs-switch-svn-kiosvn.svgz usr/share/kde4/apps/kio_perldoc/pod2html.pl -usr/share/kde4/services/ServiceMenus/subversion.desktop -usr/share/kde4/services/ServiceMenus/subversion_toplevel.desktop -usr/share/kde4/services/kded/ksvnd.desktop +# usr/share/kde4/services/ServiceMenus/subversion.desktop +# usr/share/kde4/services/ServiceMenus/subversion_toplevel.desktop +# usr/share/kde4/services/kded/ksvnd.desktop usr/share/kde4/services/perldoc.protocol -usr/share/kde4/services/svn+file.protocol -usr/share/kde4/services/svn+http.protocol -usr/share/kde4/services/svn+https.protocol -usr/share/kde4/services/svn+ssh.protocol -usr/share/kde4/services/svn.protocol +# usr/share/kde4/services/svn+file.protocol +# usr/share/kde4/services/svn+http.protocol +# usr/share/kde4/services/svn+https.protocol +# usr/share/kde4/services/svn+ssh.protocol +# usr/share/kde4/services/svn.protocol diff --git a/debian/rules b/debian/rules index bb59c98..87e8bdd 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,11 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk +override_dh_auto_configure: + $(overridden_command) -- -DBUILD_svn=FALSE + override_dh_auto_install: $(overridden_command) --destdir=debian/tmp override_dh_strip: - $(overridden_command) --dbg-package=kdesdk-kioslaves-dbg + $(overridden_command) --dbgsym-migration='kdesdk-kioslaves-dbg (<= 4:15.08.3-2~1.gbpeb13b4~)'
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
