diff -Nru pkg-kde-tools-0.15.36ubuntu5/debian/changelog pkg-kde-tools-0.15.38ubuntu1/debian/changelog --- pkg-kde-tools-0.15.36ubuntu5/debian/changelog 2022-11-13 10:58:47.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/debian/changelog 2022-12-13 22:20:09.000000000 +0000 @@ -1,3 +1,57 @@ +pkg-kde-tools (0.15.38ubuntu1) lunar; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - debian/pkg-kde-tools.install, kubuntu/*: + + Install kubuntu/ files. + - perllib/Debian/Debhelper/Sequence/kf5.pm: + + Execute dh_kubuntu_list-missing after the package is built, i.e. + after dh_builddeb. + + Execute dh_kubuntu_execute_lintian after dh_kubuntu_list-missing. + - qt-kde-team/1/debian-qt-kde.mk: + + Distribution text = "Kubuntu packages". + - qt-kde-team/2/debian-qt-kde.mk: + + Support lintian target. + - qt-kde-team/3/debian-qt-kde.mk: + + Don't execute anymore the list-missing target since that is now + managed by perllib/Debian/Debhelper/Sequence/kf5.pm. + - qt-kde-team/{2,3}/policy.mk: + + Remove maintainer checking. + - qt-kde-team/{2,3}/lintian.mk: + + Call Lintian after the binary target in debian-qt-kde.mk. + - qt-kde-team/2/list-missing.mk: + + Add marker lines recognized by Kubuntu's CI and status reports. + + -- Rik Mills Tue, 13 Dec 2022 22:20:09 +0000 + +pkg-kde-tools (0.15.38) unstable; urgency=medium + + * Remove inactive Uploaders. + * Add the configuration for the CI on salsa. + * Bump Standards-Version to 4.6.1, no changes required. + * 2/list-missing.mk, 3/list-missing.mk: switch from "egrep" to "grep -E", + as the former has been deprecated for many years. + * Add also the virtual provides dh-sequence-pkgkde-symbolshelper to + pkg-kde-tools. + * Drop debian/not-installed, as it should not be needed anymore after the + switch to the dh sequencer. + * Rename few files to make it clear to which package they refer to: + - debian/README.Debian -> debian/pkg-kde-tools.README.Debian + - debian/dirs -> debian/pkg-kde-tools.dirs + - debian/links -> debian/pkg-kde-tools.links + * Drop debian/NEWS, as the last (and only) entry is 12 years old. + * Drop the Breaks against a version of dpkg-dev older than what is in + Debian Jessie. + * Drop the dh-sequence-kde virtual provides: that dh addon is used to build + kdelibs 4.x stuff, and kdelibs 4.x is no more in Debian. + + -- Pino Toscano Sat, 10 Sep 2022 10:28:52 +0200 + +pkg-kde-tools (0.15.37) unstable; urgency=medium + + * Switch from dhmk to dh. + + -- Sandro Knauß Sat, 16 Jul 2022 13:11:00 +0200 + pkg-kde-tools (0.15.36ubuntu5) lunar; urgency=medium * Enable build time lintian again. diff -Nru pkg-kde-tools-0.15.36ubuntu5/debian/control pkg-kde-tools-0.15.38ubuntu1/debian/control --- pkg-kde-tools-0.15.36ubuntu5/debian/control 2022-11-13 10:58:47.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/debian/control 2022-12-13 22:20:09.000000000 +0000 @@ -6,11 +6,8 @@ Build-Depends: cmake (>= 2.6.4), debhelper-compat (= 13), libdpkg-perl (>= 1.19.0~) -Standards-Version: 4.6.0 -Uploaders: Sune Vuorela , - Modestas Vainius , - Maximiliano Curia , - Lisandro Damián Nicanor Pérez Meyer , +Standards-Version: 4.6.1 +Uploaders: Lisandro Damián Nicanor Pérez Meyer , Pino Toscano , Dmitry Shachnev Vcs-Git: https://salsa.debian.org/qt-kde-team/pkg-kde-tools.git @@ -27,9 +24,8 @@ ${perl:Depends} Recommends: dpkg-dev (>= 1.15.6~), libwww-perl Suggests: cdbs, debhelper (>= 7.3.16) -Breaks: dpkg-dev (<< 1.15.6~), kdelibs5-dev (<< 4:4.2.2) -Provides: dh-sequence-kde, dh-sequence-kf5, dh-sequence-qmlcdeps, dh-sequence-sodeps, - dh-sequence-pkgkde-symbolshelper +Breaks: kdelibs5-dev (<< 4:4.2.2) +Provides: dh-sequence-kf5, dh-sequence-qmlcdeps, dh-sequence-sodeps, dh-sequence-pkgkde-symbolshelper Description: various packaging tools and scripts for KDE Applications This package contains a variety of packaging tools and build scripts that may be very useful when packaging KDE applications. Even if you are a maintainer diff -Nru pkg-kde-tools-0.15.36ubuntu5/debian/dirs pkg-kde-tools-0.15.38ubuntu1/debian/dirs --- pkg-kde-tools-0.15.36ubuntu5/debian/dirs 2022-11-13 10:58:47.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/pkg-kde-tools/bin diff -Nru pkg-kde-tools-0.15.36ubuntu5/debian/links pkg-kde-tools-0.15.38ubuntu1/debian/links --- pkg-kde-tools-0.15.36ubuntu5/debian/links 2022-11-13 10:58:47.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/debian/links 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/bin/pkgkde-gensymbols usr/share/pkg-kde-tools/bin/dpkg-gensymbols -usr/share/man/man1/dpkg-gensymbols.1.gz usr/share/man/man1/pkgkde-gensymbols.1.gz -usr/share/pkg-kde-tools/cmake/README.DebianABIManager usr/share/doc/pkg-kde-tools/README.DebianABIManager diff -Nru pkg-kde-tools-0.15.36ubuntu5/debian/NEWS pkg-kde-tools-0.15.38ubuntu1/debian/NEWS --- pkg-kde-tools-0.15.36ubuntu5/debian/NEWS 2022-11-13 10:58:47.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/debian/NEWS 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -pkg-kde-tools (0.9.0) unstable; urgency=low - - HTML_INSTALL_DIR path has been switched from /usr/share/doc/kde4/HTML to - /usr/share/doc/kde/HTML. If you refer to usr/share/doc/kde4/ anywhere in the - packaging (esp. debian/*.install or debian/rules files), replace it with - /usr/share/doc/kde/ and bump pkg-kde-tools build dependency to (>= 0.9). - - -- Modestas Vainius Fri, 28 May 2010 21:22:19 +0300 diff -Nru pkg-kde-tools-0.15.36ubuntu5/debian/not-installed pkg-kde-tools-0.15.38ubuntu1/debian/not-installed --- pkg-kde-tools-0.15.36ubuntu5/debian/not-installed 2022-11-13 10:58:47.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# Manpages false positive -usr/share/man/man1/*.1 diff -Nru pkg-kde-tools-0.15.36ubuntu5/debian/pkg-kde-tools.dirs pkg-kde-tools-0.15.38ubuntu1/debian/pkg-kde-tools.dirs --- pkg-kde-tools-0.15.36ubuntu5/debian/pkg-kde-tools.dirs 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/debian/pkg-kde-tools.dirs 2022-12-13 22:20:09.000000000 +0000 @@ -0,0 +1 @@ +usr/share/pkg-kde-tools/bin diff -Nru pkg-kde-tools-0.15.36ubuntu5/debian/pkg-kde-tools.links pkg-kde-tools-0.15.38ubuntu1/debian/pkg-kde-tools.links --- pkg-kde-tools-0.15.36ubuntu5/debian/pkg-kde-tools.links 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/debian/pkg-kde-tools.links 2022-12-13 22:20:09.000000000 +0000 @@ -0,0 +1,3 @@ +usr/bin/pkgkde-gensymbols usr/share/pkg-kde-tools/bin/dpkg-gensymbols +usr/share/man/man1/dpkg-gensymbols.1.gz usr/share/man/man1/pkgkde-gensymbols.1.gz +usr/share/pkg-kde-tools/cmake/README.DebianABIManager usr/share/doc/pkg-kde-tools/README.DebianABIManager diff -Nru pkg-kde-tools-0.15.36ubuntu5/debian/pkg-kde-tools.README.Debian pkg-kde-tools-0.15.38ubuntu1/debian/pkg-kde-tools.README.Debian --- pkg-kde-tools-0.15.36ubuntu5/debian/pkg-kde-tools.README.Debian 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/debian/pkg-kde-tools.README.Debian 2022-12-13 22:20:09.000000000 +0000 @@ -0,0 +1,107 @@ +pkg-kde-tools for Debian +------------------------ + + These snippets (/usr/share/pkg-kde-tools/makefiles/1) should be universally + usable: + - If your package uses CDBS, you should be able to just include the + cdbs/kde.mk file. + - If you use other tools, include the variables.mk file and run cmake with + $(DEB_CMAKE_KDE4_FLAGS) to get the kde4 default variables. + - If you want to use Debhelper dh(1) command sequencer, you will find section + "Using with Debhelper Command Sequencer `dh`" below interesting. Please + note that /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk has been + dropped in pkg-kde-tools 0.7.0. + + In order to link with --as-needed (disabled by default), you could set + DEB_KDE_LINK_WITH_AS_NEEDED to 'yes' before the include. However, please note + that enabling DEB_KDE_LINK_WITH_AS_NEEDED implicitly links with --no-undefined + as well unless DEB_KDE_LINK_WITH_NO_UNDEFINED is set to `no`. + +Using with Debhelper Command Sequencer `dh` +------------------------------------------ + +pkg-kde-tools provides a couple of additions to dh(1) and its toolset. + +* Debhelper build system 'kde'. It is based on the debhelper build system + 'cmake'. The only difference is that in addition it passes KDE 4 specific + flags to cmake by default. In order to use it, pass --buildsystem=kde when + running dh_auto_*. Debhelper 7.3.0 or later is required to use this build + system. +* dh sequence addon 'kde'. It will tweak default dh sequences to be best + suitable for building KDE applications. For example, that includes passing of + --buildsystem=kde to all dh_auto_* commands by default and other + enhancements. Debhelper 7.3.16 or later is required to use this addon. + +In order to build a simple KDE package, all you need to do is to pass `--with +kde` option to dh(1). More advanced usage (e.g. to pass additional flags to +cmake) may require overriding of some debhelper commands (e.g. +dh_auto_configure). See examples below for more details. + +In order to kde dh sequence addon, you must depend on debhelper (>= 7.3.16) and +pkg-kde-tools (>= 0.5). What's more, pkg-kde-tools (>= 0.6.2) has more +interesting changes like dh_movelibkdeinit and docbook exclusion from +dh_compress. + +Examples +-------- + +* A CDBS using package. + +-------> debian/rules <------- +#!/usr/bin/make -f + +include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk +include /usr/share/cdbs/1/rules/debhelper.mk +------------------------------ + +* A non CDBS using package could start with something like the following + and end up like any other cmake using package. + +-------> debian/rules <------- +#!/usr/bin/make -f + +include /usr/share/pkg-kde-tools/makefiles/1/variables.mk + +builddir/Makefile: + dh_testdir + + mkdir -p builddir + cd builddir && cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_C_FLAGS="$(CPPFLAGS) $(CFLAGS)" \ + -DCMAKE_LD_FLAGS="$(LDFLAGS) -Wl,-z,defs" \ + -DCMAKE_CXX_FLAGS="$(CPPFLAGS) $(CXXFLAGS)" \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + $(DEB_CMAKE_KDE4_FLAGS) + +build: build-stamp +build-stamp: builddir/Makefile + dh_testdir + + $(MAKE) -C builddir + + touch $@ +------------------------------ + +* A very simple KDE package using dh. + +-------> debian/rules <------- +#!/usr/bin/make -f + +%: + dh $@ --with kde +------------------------------ + +* A more complicated KDE package using dh. Additional -DSOME_FLAG is passed to + cmake and quilt addon is used for managing patches. + +-------> debian/rules <------- +#!/usr/bin/make -f + +override_dh_auto_configure: + dh_auto_configure --buildsystem=kde -- -DSOME_FLAG=some_value + +%: + dh $@ --with quilt,kde +------------------------------ diff -Nru pkg-kde-tools-0.15.36ubuntu5/debian/README.Debian pkg-kde-tools-0.15.38ubuntu1/debian/README.Debian --- pkg-kde-tools-0.15.36ubuntu5/debian/README.Debian 2022-11-13 10:58:47.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -pkg-kde-tools for Debian ------------------------- - - These snippets (/usr/share/pkg-kde-tools/makefiles/1) should be universally - usable: - - If your package uses CDBS, you should be able to just include the - cdbs/kde.mk file. - - If you use other tools, include the variables.mk file and run cmake with - $(DEB_CMAKE_KDE4_FLAGS) to get the kde4 default variables. - - If you want to use Debhelper dh(1) command sequencer, you will find section - "Using with Debhelper Command Sequencer `dh`" below interesting. Please - note that /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk has been - dropped in pkg-kde-tools 0.7.0. - - In order to link with --as-needed (disabled by default), you could set - DEB_KDE_LINK_WITH_AS_NEEDED to 'yes' before the include. However, please note - that enabling DEB_KDE_LINK_WITH_AS_NEEDED implicitly links with --no-undefined - as well unless DEB_KDE_LINK_WITH_NO_UNDEFINED is set to `no`. - -Using with Debhelper Command Sequencer `dh` ------------------------------------------- - -pkg-kde-tools provides a couple of additions to dh(1) and its toolset. - -* Debhelper build system 'kde'. It is based on the debhelper build system - 'cmake'. The only difference is that in addition it passes KDE 4 specific - flags to cmake by default. In order to use it, pass --buildsystem=kde when - running dh_auto_*. Debhelper 7.3.0 or later is required to use this build - system. -* dh sequence addon 'kde'. It will tweak default dh sequences to be best - suitable for building KDE applications. For example, that includes passing of - --buildsystem=kde to all dh_auto_* commands by default and other - enhancements. Debhelper 7.3.16 or later is required to use this addon. - -In order to build a simple KDE package, all you need to do is to pass `--with -kde` option to dh(1). More advanced usage (e.g. to pass additional flags to -cmake) may require overriding of some debhelper commands (e.g. -dh_auto_configure). See examples below for more details. - -In order to kde dh sequence addon, you must depend on debhelper (>= 7.3.16) and -pkg-kde-tools (>= 0.5). What's more, pkg-kde-tools (>= 0.6.2) has more -interesting changes like dh_movelibkdeinit and docbook exclusion from -dh_compress. - -Examples --------- - -* A CDBS using package. - --------> debian/rules <------- -#!/usr/bin/make -f - -include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk -include /usr/share/cdbs/1/rules/debhelper.mk ------------------------------- - -* A non CDBS using package could start with something like the following - and end up like any other cmake using package. - --------> debian/rules <------- -#!/usr/bin/make -f - -include /usr/share/pkg-kde-tools/makefiles/1/variables.mk - -builddir/Makefile: - dh_testdir - - mkdir -p builddir - cd builddir && cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_C_FLAGS="$(CPPFLAGS) $(CFLAGS)" \ - -DCMAKE_LD_FLAGS="$(LDFLAGS) -Wl,-z,defs" \ - -DCMAKE_CXX_FLAGS="$(CPPFLAGS) $(CXXFLAGS)" \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - $(DEB_CMAKE_KDE4_FLAGS) - -build: build-stamp -build-stamp: builddir/Makefile - dh_testdir - - $(MAKE) -C builddir - - touch $@ ------------------------------- - -* A very simple KDE package using dh. - --------> debian/rules <------- -#!/usr/bin/make -f - -%: - dh $@ --with kde ------------------------------- - -* A more complicated KDE package using dh. Additional -DSOME_FLAG is passed to - cmake and quilt addon is used for managing patches. - --------> debian/rules <------- -#!/usr/bin/make -f - -override_dh_auto_configure: - dh_auto_configure --buildsystem=kde -- -DSOME_FLAG=some_value - -%: - dh $@ --with quilt,kde ------------------------------- diff -Nru pkg-kde-tools-0.15.36ubuntu5/debian/rules pkg-kde-tools-0.15.38ubuntu1/debian/rules --- pkg-kde-tools-0.15.36ubuntu5/debian/rules 2022-11-13 10:58:47.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/debian/rules 2022-12-13 22:20:09.000000000 +0000 @@ -2,44 +2,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all -include qt-kde-team/2/dhmk.mk - -# KDE branch to use. Various scripts are coming from kdesdk or other parts of -# KDE, those will preferrably be fetched from the branch (still taking into -# account the revision from below). -KDEBRANCH=v4.13.0 - -KDEGIT=git://anongit.kde.org -TARGET=kubuntu/libexec -CPTARGET=../kubuntu/libexec -EXPORT=export -r$(SVNREV) --force - -# Note that for git we use single branch shallow clone of the git tags. This is -# about as fast as it gets with git. -syncl10ninternal: - svn $(EXPORT) svn://anonsvn.kde.org/home/kde/branches/stable/l10n-kde4/scripts/createdesktopcontext.pl $(TARGET)/createdesktopcontext.pl - svn $(EXPORT) svn://anonsvn.kde.org/home/kde/branches/stable/l10n-kde4/scripts/extract-messages.sh $(TARGET)/extract-messages.sh - svn $(EXPORT) svn://anonsvn.kde.org/home/kde/branches/stable/l10n-kde4/scripts/extract-xml.sh $(TARGET)/extract-xml.sh - svn $(EXPORT) svn://anonsvn.kde.org/home/kde/branches/stable/l10n-kde4/scripts/msgsplit $(TARGET)/msgsplit - @echo "Working on kde-dev-scripts" - git clone --branch $(KDEBRANCH) --depth 1 --single-branch $(KDEGIT)/kde-dev-scripts.git && \ - cd kde-dev-scripts && \ - cp extractattr $(CPTARGET) && \ - cp extractrc $(CPTARGET) - @echo "Working on kdelibs" - git clone --branch $(KDEBRANCH) --depth 1 --single-branch $(KDEGIT)/kdelibs.git && \ - cd kdelibs && \ - cp kdeui/preparetips $(CPTARGET) - -syncl10nclean: - rm -rf kde-dev-scripts - rm -rf kdelibs - -# Clean git directories before and after to prevent problems. -syncl10n: syncl10nclean syncl10ninternal syncl10nclean - -# ...also clean git directories as part of regular clean. -override_dh_auto_clean: syncl10nclean - dh_auto_clean - -.PHONY: override_dh_auto_clean syncl10n syncl10nclean syncl10ninternal +%: + dh $@ diff -Nru pkg-kde-tools-0.15.36ubuntu5/debian/salsa-ci.yml pkg-kde-tools-0.15.38ubuntu1/debian/salsa-ci.yml --- pkg-kde-tools-0.15.36ubuntu5/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/debian/salsa-ci.yml 2022-12-13 22:20:09.000000000 +0000 @@ -0,0 +1,7 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml +variables: + SALSA_CI_DISABLE_MISSING_BREAKS: 'no' + SALSA_CI_DISABLE_RC_BUGS: 'no' + SALSA_CI_REPROTEST_ARGS: '--variations=-build-path' diff -Nru pkg-kde-tools-0.15.36ubuntu5/qt-kde-team/2/list-missing.mk pkg-kde-tools-0.15.38ubuntu1/qt-kde-team/2/list-missing.mk --- pkg-kde-tools-0.15.36ubuntu5/qt-kde-team/2/list-missing.mk 2022-11-13 10:58:47.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/qt-kde-team/2/list-missing.mk 2022-12-13 22:20:09.000000000 +0000 @@ -27,7 +27,7 @@ done; \ test -e debian/not-installed && grep -v '^#' debian/not-installed; \ ) | sort -u > debian/dhmk-package-list; \ - diff -u debian/dhmk-install-list debian/dhmk-package-list | sed '1,2d' | egrep '^-' || true; \ + diff -u debian/dhmk-install-list debian/dhmk-package-list | sed '1,2d' | grep -E '^-' || true; \ echo "=== End list-missing"; \ else \ echo "=== Start list-missing"; \ diff -Nru pkg-kde-tools-0.15.36ubuntu5/qt-kde-team/3/list-missing.mk pkg-kde-tools-0.15.38ubuntu1/qt-kde-team/3/list-missing.mk --- pkg-kde-tools-0.15.36ubuntu5/qt-kde-team/3/list-missing.mk 2022-11-13 10:58:47.000000000 +0000 +++ pkg-kde-tools-0.15.38ubuntu1/qt-kde-team/3/list-missing.mk 2022-12-13 22:20:09.000000000 +0000 @@ -30,7 +30,7 @@ (cd debian/tmp; find . '(' -path "$${glob_patt}" -o -path "$${glob_patt}"'/*' ')' '(' -type f -o -type l ')'); \ done; \ ) | sort -u > debian/dhmk-package-list; \ - diff -u debian/dhmk-install-list debian/dhmk-package-list | sed '1,2d' | egrep '^-' || true; \ + diff -u debian/dhmk-install-list debian/dhmk-package-list | sed '1,2d' | grep -E '^-' || true; \ echo "=== End list-missing"; \ else \ echo "=== End list-missing"; \