[SCM] ci-tooling packaging branch, master, updated. 3ac5ef59d0b86b527c51b783faceac736aac0840
Harald Sitter
apachelogger-guest at moszumanska.debian.org
Wed Oct 7 06:09:49 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=3ac5ef5
The following commit has been merged in the master branch:
commit 3ac5ef59d0b86b527c51b783faceac736aac0840
Author: Harald Sitter <sitter at kde.org>
Date: Wed Oct 7 08:09:44 2015 +0200
fix bloody l10n hack. testing would have been useful there...
---
lib/ci/build_source.rb | 2 +-
.../packaging/debian/changelog | 9 +
.../packaging/debian/control | 205 +++++++++++++++++++++
.../debian/libkf5kdelibs4support-data.install | 24 +++
.../debian/libkf5kdelibs4support-dev.install | 10 +
.../debian/libkf5kdelibs4support5-bin.install | 10 +
.../debian/libkf5kdelibs4support5.install | 2 +
.../packaging/debian/rules | 11 ++
.../packaging/debian/source/format | 0
test/test_ci_build_source.rb | 13 ++
10 files changed, 285 insertions(+), 1 deletion(-)
diff --git a/lib/ci/build_source.rb b/lib/ci/build_source.rb
index e2aac37..71546f8 100644
--- a/lib/ci/build_source.rb
+++ b/lib/ci/build_source.rb
@@ -121,7 +121,7 @@ class VcsSourceBuilder
# FIXME: bloody workaround for kconfigwidgets and kdelibs4support
# containing legit locale data
- next if %w(kconfigwidgets kdelibs4support).include?(@name)
+ next if %w(kconfigwidgets kdelibs4support).include?(@source.name)
locale_regex = %r{^.*usr/share/locale.*$}
subbed = File.open(install_file_path).read.gsub(locale_regex, '')
diff --git a/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/changelog b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/changelog
new file mode 100644
index 0000000..09a508c
--- /dev/null
+++ b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/changelog
@@ -0,0 +1,9 @@
+kdelibs4support (5.15.0-0ubuntu1) UNRELEASED; urgency=medium
+
+ [ Scarlett Clark ]
+ * Vivid backport
+
+ [ Jonathan Riddell ]
+ * new upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 05 Oct 2015 19:44:57 +0100
diff --git a/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/control b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/control
new file mode 100644
index 0000000..2fc87d4
--- /dev/null
+++ b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/control
@@ -0,0 +1,205 @@
+Source: kdelibs4support
+Section: libs
+Priority: optional
+Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Uploaders: Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake (>= 2.8.12),
+ debhelper (>= 9),
+ extra-cmake-modules (>= 5.15.0~),
+ kdesignerplugin (>= 5.12.0~),
+ kdoctools-dev (>= 5.15.0~),
+ kgendesignerplugin (>= 5.15.0~),
+ kio-dev (>= 5.15.0~),
+ libecm-dev,
+ libintl-perl,
+ libkf5completion-dev (>= 5.15.0~),
+ libkf5config-dev (>= 5.15.0~),
+ libkf5configwidgets-dev (>= 5.15.0~),
+ libkf5crash-dev (>= 5.15.0~),
+ libkf5dbusaddons-dev (>= 5.15.0~),
+ libkf5globalaccel-dev (>= 5.15.0~),
+ libkf5guiaddons-dev (>= 5.15.0~),
+ libkf5i18n-dev (>= 5.15.0~),
+ libkf5iconthemes-dev (>= 5.15.0~),
+ libkf5notifications-dev (>= 5.15.0~),
+ libkf5parts-dev (>= 5.15.0~),
+ libkf5service-dev (>= 5.15.0~),
+ libkf5textwidgets-dev (>= 5.15.0~),
+ libkf5unitconversion-dev (>= 5.15.0~),
+ libkf5widgetsaddons-dev (>= 5.15.0~),
+ libkf5windowsystem-dev (>= 5.15.0~),
+ libkf5xmlgui-dev (>= 5.15.0~),
+ libqt5concurrent5,
+ libqt5dbus5,
+ libqt5gui5,
+ libqt5network5,
+ libqt5printsupport5,
+ libqt5svg5-dev (>= 5.4),
+ libqt5test5,
+ libqt5widgets5,
+ libqt5x11extras5-dev (>= 5.4),
+ libqt5xml5,
+ libsm-dev,
+ libssl-dev,
+ liburi-perl,
+ libx11-dev,
+ network-manager-dev (>= 0.7.0~),
+ pkg-config,
+ pkg-kde-tools (>= 0.15.15ubuntu1~),
+ qtbase5-dev (>= 5.4),
+ qttools5-dev (>= 5.4)
+Standards-Version: 3.9.6
+XS-Testsuite: autopkgtest
+Homepage: https://projects.kde.org/projects/frameworks/portingAids/kdelibs4support
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/kdelibs4support.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kdelibs4support.git
+
+Package: libkf5kdelibs4support-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: kdoctools-dev (>= 5.15.0~),
+ kgendesignerplugin (>= 5.15.0~),
+ kinit-dev,
+ kross-dev,
+ libkf5configwidgets-dev (>= 5.15.0~),
+ libkf5crash-dev (>= 5.15.0~),
+ libkf5dnssd-dev,
+ libkf5emoticons-dev,
+ libkf5guiaddons-dev (>= 5.15.0~),
+ libkf5iconthemes-dev (>= 5.15.0~),
+ libkf5idletime-dev,
+ libkf5itemmodels-dev,
+ libkf5kcmutils-dev,
+ libkf5kdelibs4support5 (= ${binary:Version}),
+ libkf5kdelibs4support5-bin (= ${binary:Version}),
+ libkf5khtml-dev,
+ libkf5mediaplayer-dev,
+ libkf5newstuff-dev,
+ libkf5notifications-dev (>= 5.15.0~),
+ libkf5notifyconfig-dev,
+ libkf5parts-dev (>= 5.15.0~),
+ libkf5plotting-dev,
+ libkf5style-dev,
+ libkf5su-dev,
+ libkf5textwidgets-dev (>= 5.15.0~),
+ libkf5threadweaver-dev,
+ libkf5unitconversion-dev (>= 5.15.0~),
+ libkf5wallet-dev,
+ libkf5webkit-dev,
+ libkf5windowsystem-dev (>= 5.15.0~),
+ libssl-dev,
+ qtbase5-dev (>= 5.4),
+ ${misc:Depends}
+Description: development files for kde4support
+ This framework provides code and utilities to ease
+ the transition from kdelibs 4 to KDE Frameworks 5.
+ This includes CMake macros and C++ classes whose
+ functionality has been replaced by code in CMake,
+ Qt and other frameworks.
+ .
+ Code should aim to port away from this framework eventually.
+ The API documentation of the classes in this framework and
+ the notes at <http://community.kde.org/Frameworks/Porting_Notes>
+ should help with this.
+ .
+ Note that some of the classes in this framework, especially
+ KStandardDirs, may not work correctly unless any libraries
+ and other software using the KDE4 Support framework are
+ installed to the same location as KDE4Support, although
+ it may be sufficient to set the KDEDIRS environment
+ variable correctly.
+ .
+ Contains development files for kde4support.
+
+Package: libkf5kdelibs4support5
+Architecture: any
+Depends: libkf5kdelibs4support-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: libkf5kdelibs4support5-bin (= ${binary:Version})
+Multi-Arch: same
+Description: Porting aid from KDELibs4.
+ This framework provides code and utilities to ease
+ the transition from kdelibs 4 to KDE Frameworks 5.
+ This includes CMake macros and C++ classes whose
+ functionality has been replaced by code in CMake,
+ Qt and other frameworks.
+ .
+ Code should aim to port away from this framework eventually.
+ The API documentation of the classes in this framework and
+ the notes at <http://community.kde.org/Frameworks/Porting_Notes>
+ should help with this.
+ .
+ Note that some of the classes in this framework, especially
+ KStandardDirs, may not work correctly unless any libraries
+ and other software using the KDE4 Support framework are
+ installed to the same location as KDE4Support, although
+ it may be sufficient to set the KDEDIRS environment
+ variable correctly.
+
+Package: libkf5kdelibs4support-data
+Multi-Arch: foreign
+Architecture: all
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libkf5kdelibs4support5-data
+Replaces: libkf5kdelibs4support5-data
+Description: Porting aid from KDELibs4.
+ This framework provides code and utilities to ease
+ the transition from kdelibs 4 to KDE Frameworks 5.
+ This includes CMake macros and C++ classes whose
+ functionality has been replaced by code in CMake,
+ Qt and other frameworks.
+ .
+ Code should aim to port away from this framework eventually.
+ The API documentation of the classes in this framework and
+ the notes at <http://community.kde.org/Frameworks/Porting_Notes>
+ should help with this.
+ .
+ This package contains the data files used by kdelibs4support.
+
+Package: libkf5kdelibs4support5-bin
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libkf5kdelibs4support-data (<< 5.12.0~)
+Replaces: libkf5kdelibs4support-data (<< 5.12.0~)
+Description: Porting aid from KDELibs4.
+ This framework provides code and utilities to ease
+ the transition from kdelibs 4 to KDE Frameworks 5.
+ This includes CMake macros and C++ classes whose
+ functionality has been replaced by code in CMake,
+ Qt and other frameworks.
+ .
+ Code should aim to port away from this framework eventually.
+ The API documentation of the classes in this framework and
+ the notes at <http://community.kde.org/Frameworks/Porting_Notes>
+ should help with this.
+ .
+ This package contains binaries and plugins from kdelibs4support.
+
+Package: libkf5kdelibs4support5-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libkf5kdelibs4support5 (= ${binary:Version}), ${misc:Depends}
+Recommends: libkf5kdelibs4support5-bin (= ${binary:Version})
+Description: debug symbols for kde4support
+ This framework provides code and utilities to ease
+ the transition from kdelibs 4 to KDE Frameworks 5.
+ This includes CMake macros and C++ classes whose
+ functionality has been replaced by code in CMake,
+ Qt and other frameworks.
+ .
+ Code should aim to port away from this framework eventually.
+ The API documentation of the classes in this framework and
+ the notes at <http://community.kde.org/Frameworks/Porting_Notes>
+ should help with this.
+ .
+ Note that some of the classes in this framework, especially
+ KStandardDirs, may not work correctly unless any libraries
+ and other software using the KDE4 Support framework are
+ installed to the same location as KDE4Support, although
+ it may be sufficient to set the KDEDIRS environment
+ variable correctly.
+ .
+ Contains debug symbols for kde4support.
diff --git a/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/libkf5kdelibs4support-data.install b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/libkf5kdelibs4support-data.install
new file mode 100644
index 0000000..fbfe99f
--- /dev/null
+++ b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/libkf5kdelibs4support-data.install
@@ -0,0 +1,24 @@
+etc/xdg/colors/40.colors
+etc/xdg/colors/Oxygen.colors
+etc/xdg/colors/Rainbow.colors
+etc/xdg/colors/Royal.colors
+etc/xdg/colors/Web.colors
+etc/xdg/kdebug.areas
+etc/xdg/kdebugrc
+etc/xdg/ksslcalist
+usr/share/doc/HTML/*/kcontrol/
+usr/share/doc/HTML/*/kdebugdialog5/
+usr/share/kf5/kdoctools/customization/catalog4.xml
+usr/share/kf5/kdoctools/customization/dtd/kdex.dtd
+usr/share/kf5/kssl/ca-bundle.crt
+usr/share/kf5/locale/countries/
+usr/share/kf5/locale/currency/
+usr/share/kf5/widgets/pics/
+usr/share/kservices5/kcm_ssl.desktop
+usr/share/kservices5/metainfo.protocol
+usr/share/kservices5/qimageioplugins/
+usr/share/kservicetypes5/kdatatool.desktop
+usr/share/kservicetypes5/kfilewrite.desktop
+usr/share/kservicetypes5/kscan.desktop
+usr/share/kservicetypes5/qimageio_plugin.desktop
+usr/share/locale/*
diff --git a/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/libkf5kdelibs4support-dev.install b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/libkf5kdelibs4support-dev.install
new file mode 100644
index 0000000..15f2a61
--- /dev/null
+++ b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/libkf5kdelibs4support-dev.install
@@ -0,0 +1,10 @@
+usr/include/KF5/KDELibs4Support/
+usr/include/KF5/kdelibs4support_version.h
+usr/lib/*/cmake/KDELibs4/
+usr/lib/*/cmake/KF5KDE4Support/
+usr/lib/*/cmake/KF5KDELibs4Support/
+usr/lib/*/libKF5KDELibs4Support.so
+usr/share/dbus-1/interfaces/kf5_org.freedesktop.PowerManagement.Inhibit.xml
+usr/share/dbus-1/interfaces/kf5_org.freedesktop.PowerManagement.xml
+usr/share/dbus-1/interfaces/kf5_org.kde.Solid.Networking.Client.xml
+usr/share/dbus-1/interfaces/kf5_org.kde.Solid.PowerManagement.PolicyAgent.xml
diff --git a/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/libkf5kdelibs4support5-bin.install b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/libkf5kdelibs4support5-bin.install
new file mode 100644
index 0000000..04d848c
--- /dev/null
+++ b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/libkf5kdelibs4support5-bin.install
@@ -0,0 +1,10 @@
+usr/bin/kdebugdialog5
+usr/bin/kf5-config
+usr/lib/*/libexec/kf5/filesharelist
+usr/lib/*/libexec/kf5/fileshareset
+usr/lib/*/qt5/plugins/designer/kf5deprecatedwidgets.so
+usr/lib/*/qt5/plugins/kcm_ssl.so
+usr/lib/*/qt5/plugins/kf5/kded/networkstatus.so
+usr/lib/*/qt5/plugins/kf5/kio/metainfo.so
+usr/share/man/*/man1/kf5-config.1
+usr/share/man/man1/kf5-config.1
diff --git a/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/libkf5kdelibs4support5.install b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/libkf5kdelibs4support5.install
new file mode 100644
index 0000000..5404c3d
--- /dev/null
+++ b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/libkf5kdelibs4support5.install
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5KDELibs4Support.so.5
+usr/lib/*/libKF5KDELibs4Support.so.5.*
diff --git a/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/rules b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/rules
new file mode 100755
index 0000000..051ab47
--- /dev/null
+++ b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/rules
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+
+override_dh_strip:
+ $(overridden_command) --dbg-package=libkf5kdelibs4support5-dbg
+
+override_dh_auto_test:
+ # Disable dh_auto_test at build time
+ :
diff --git a/test/data/test_ci_build_source/test_build_fail/packaging/debian/source/format b/test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/source/format
similarity index 100%
copy from test/data/test_ci_build_source/test_build_fail/packaging/debian/source/format
copy to test/data/test_ci_build_source/test_locale_kdelibs4support/packaging/debian/source/format
diff --git a/test/test_ci_build_source.rb b/test/test_ci_build_source.rb
index 7b9c8a2..bc9d35b 100644
--- a/test/test_ci_build_source.rb
+++ b/test/test_ci_build_source.rb
@@ -143,4 +143,17 @@ class VCSBuilderTest < TestCase
assert_changelogid('debian',
' -- Debian CI <null at debian.org>')
end
+
+ def test_locale_kdelibs4support
+ source = VcsSourceBuilder.new(release: @release).run
+ Dir.chdir('build') do
+ # FIXME: composition should be in source really
+ dsc = "#{source.name}_#{source.version}.dsc"
+ install = "#{source.name}-#{source.build_version.tar}/debian/" \
+ 'libkf5kdelibs4support-data.install'
+ assert(system('dpkg-source', '-x', dsc))
+ data = File.read(install).split($/)
+ assert_include(data, 'usr/share/locale/*')
+ end
+ end
end
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list