[SCM] extra-cmake-modules packaging branch, master, updated. debian/1.0.0-1-7-g5c397a2
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Wed Sep 24 08:44:52 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/extra-cmake-modules.git;a=commitdiff;h=5c397a2
The following commit has been merged in the master branch:
commit 5c397a2eef20251fc81fba3df21d60a36e7ff3ab
Author: Jonathan Riddell <jr at jriddell.org>
Date: Wed Sep 24 10:44:47 2014 +0200
sync to latest kubuntu version
---
debian/changelog | 14 +++
debian/copyright | 113 ++++++++++-----------
debian/patches/kde-install-dirs.diff | 96 -----------------
debian/patches/series | 2 -
...heck-the-libdir-also-on-kFreeBSD-and-Hurd.patch | 36 -------
debian/rules | 2 +-
debian/watch | 3 +-
7 files changed, 69 insertions(+), 197 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 53a2507..011ae9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+extra-cmake-modules (1.3.0~git20140917-0ubuntu1) utopic; urgency=medium
+
+ * Git snapshot needed to allow qmldir to follow qt_sys_path.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Wed, 17 Sep 2014 04:01:18 -0700
+
+extra-cmake-modules (1.2.1-0ubuntu1~ubuntu14.10~ppa1) utopic; urgency=medium
+
+ * New upstream release
+ * Build-dep on pkg-kde-tools >= 0.15.15ubuntu1
+ * Remove kde-install-dirs.diff better detection upstream by Rohan
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Thu, 11 Sep 2014 21:17:06 +0000
+
extra-cmake-modules (1.1.0-0ubuntu1) utopic; urgency=medium
* New upstream release
diff --git a/debian/copyright b/debian/copyright
index c4b5c20..91b78b8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,67 +3,58 @@ Upstream-Name: extra-cmake-modules
Source: https://projects.kde.org/projects/kdesupport/extra-cmake-modules
Files: *
-Copyright: 2008, Adrian Page <adrian at pagenet.plus.com>
- 2013, Albert Astals Cid <aacid at kde.org>
- 2013, Aleix Pol <aleixpol at kde.org>
- 2013, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
- 2006 Alexander Dymo <adymo at kdevelop.org>,
- 2006-2013, Alexander Neundorf <neundorf at kde.org>,
- 2013, Alexander Richardson <arichardson.kde at gmail.com>
- 2013-2014, Alex Merry <alex.merry at kde.org>
- 2007, Allen Winter <winter at kde.org>
- 2010, Andreas Holzammer <andy at kdab.com>
- 2007, Andreas Pakulat <apaku at gmx.de>
- 2014, Aurélien Gâteau <agateau at kde.org>
- 2006, Benjamin Reed, <ranger at befunk.com>
- 2009, Canonical Ltd.
- 2007, Charles Connell <charles at connells.org>
- 2007, Christian Ehrlicher <ch.ehrlicher at gmx.de>
- 2006-2008, Chusslove Illich <caslav.ilic at gmx.net>
- 2009, Cyrille Berger <cberger at cberger.net>
- 2008, Daniel Gollub <dgollub at suse.de>
- 2009, Daniel Nicoletti <dantti85-pk at yahoo.com.br>
- 2009, Dario Freddi <drf at kde.org>
- 2013, David Edmundson <kde at davidedmundson.co.uk>
- 2006-2012, David Faure <faure at kde.org>
- 2006, Egon Willighagen <egonw at users.sf.net>
- 2009, Frederik Gladhorn <gladhorn at kde.org>
- 2011, Fredrik Höglund <fredrik at kde.org>
- 2008-2009, Gael Guennebaud <g.gael at free.fr>
- 2007, Gerd Fleischer <gerdfleischer at web.de>
- 2008, Gilles Caulier <caulier.gilles at gmail.com>
- 2009, Harald Fernengel <harry at kdevelop.org>
- 2008-2009, Helio Chissini de Castro <helio at kde.org>
- 2007, Jakub Stachowski <qbast at go2.pl>
- 2006-2008, Jarosław Staniek <staniek at kde.org>
- 2008, Jos van den Oever <jos at vandenoever.info>
- 2006-2008, Junio C Hamano
- 2000-2013, Kitware, Inc.
- 2006-2008, Laurent Montel <montel at kde.org>
- 2006-2009, Marcus Hufgard <Marcus.Hufgard at hufgard.de>
- 2013, Martin Gräßlin <mgraesslin at kde.org>
- 2006-2007, Matthias Kretz <kretz at kde.org>
- 2006, Michael Larouche <michael.larouche at kdemail.net>
- 2009, Michal Malek <michalm at jabster.pl>
- 2006-2007, Montel Laurent <montel at kde.org>
- 2008, Patrick Spendrin <ps_ml at gmx.de>
- 2010, Paulo Romulo Alves Barros <paulo.romulo at kdemail.net>
- 2008, Per Øyvind Karlsen <peroyvind at mandriva.org>
- 2006-2007, Pino Toscano <toscano.pino at tiscali.it>
- 2010, Rafael Fernández López <ereslibre at kde.org>
- 2006-2009, Ralf Habacker <ralf.habacker at freenet.de>
- 2011-2013, Raphael Kubo da Costa <kubito at gmail.com>
- 2006, Richard Laerkaeng <richard at goteborg.utfors.se>
- 2008-2009, Sebastian Trueg <sebastian at trueg.de>
- 2007-2008, Simon Edwards <simon at simonzone.com>
- 2013, Stephen Kelly <steveire at gmail.com>
- 2006, Thorsten Roeder <thorsten.roeder at weihenstephan.org>
- 2006, Tim Beaulen <tbscope at gmail.com>
- 2006, Wilfried Huss <wilfried.huss at gmx.at>
- 2007, Will Stephenson <wstephenson at kde.org>
- 2011-2013, Yury Kudryashov <urkud at ya.ru>
- 2006, Zack Rusin <zack at kde.org>
-License: BSD-3-clause
+Copyright: 2006,2008 Alexander Neundorf <neundorf at kde.org>,
+ 2008 Adrian Page <adrian at pagenet.plus.com>,
+ 2006, 2010 Alexander Neundorf <neundorf at kde.org>,
+ 2006 Alexander Dymo <adymo at kdevelop.org>,
+ 2006 Alexander Neundorf <neundorf at kde.org>,
+ 2007 Allen Winter <winter at kde.org>,
+ 2010 Andreas Holzammer <andy at kdab.com>,
+ 2007 Andreas Pakulat <apaku at gmx.de>,
+ 2006 Benjamin Reed <ranger at befunk.com>,
+ 2007 Charles Connell <charles at connells.org>,
+ 2007 Christian Ehrlicher <ch.ehrlicher at gmx.de>,
+ 2006 Chusslove Illich <caslav.ilic at gmx.net>,
+ 2009 Cyrille Berger <cberger at cberger.net>,
+ 2008 Daniel Gollub <dgollub at suse.de>,
+ 2009 Daniel Nicoletti <dantti85-pk at yahoo.com.br>,
+ 2006,2012 David Faure <faure at kde.org>,
+ 2009 Dario Freddi <drf54321 at gmail.com>,
+ 2006 Egon Willighagen <egonw at users.sf.net>,
+ 2009 Frederik Gladhorn <gladhorn at kde.org>,
+ 2011 Fredrik Höglund <fredrik at kde.org>,
+ 2008, 2009 Gael Guennebaud <g.gael at free.fr>,
+ 2007 Gerd Fleisher <gerdfleischer at web.de>,
+ 2008 Gilles Caulier <caulier.gilles at gmail.com>,
+ 2009 Harald Fernengel <harry at kdevelop.org>,
+ 2009 Helio Chissini de Castro <helio at kde.org>,
+ 2006-2008 Jarosław Staniek <staniek at kde.org>,
+ 2007 Jakub Stachowski <qbast at go2.pl>,
+ 2008 Jos van den Oever <jos at vandenoever.info>,
+ 2002,2005-2009 Kitware, Inc,
+ 2006,2007 Laurent Montel <montel at kde.org>,
+ 2010 Luigi Toscano <luigi.toscano at tiscali.it>,
+ 2006,2009 Marcus Hufgard <hufgardm at hufgard.de>,
+ 2013 Martin Gräßlin <mgraesslin at kde.org>,
+ 2006, 2007 Matthias Kretz <kretz at kde.org>,
+ 2006 Michael Larouche <michael.larouche at kdemail.net>,
+ 2009 Michal Malek <michalm at jabster.pl>,
+ 2008 Patrick Spendrin <ps_ml at gmx.de>,
+ 2010 Paulo Romulo Alves Barros <paulo.romulo at kdemail.net>,
+ 2008 Per Øyvind Karlsen <peroyvind at mandriva.org>,
+ 2006 Pino Toscano <toscano.pino at tiscali.it>,
+ 2006-2009 Ralf Habacker,
+ 2010 Rafael Fernández López <ereslibre at kde.org>,
+ 2011 Raphael Kubo da Costa <kubito at gmail.com>,
+ 2006 Richard Laerkaeng <richard at goteborg.utfors.se>,
+ 2008,2009 Sebastian Trueg <sebastian at trueg.de>,
+ 2007-2008 Simon Edwards <simon at simonzone.com>,
+ 2006 Tim Beaulen <tbscope at gmail.com>,
+ 2006 Thorsten Roeder <thorsten.roeder at weihenstephan.org>,
+ 2006 Wilfried Huss <wilfried.huss at gmx.at>,
+ 2007 Will Stephenson <wstephenson at kde.org>,
+ 2006 Zack Rusin <zack at kde.org>,
+License: BSD-3-Clause
Redistribution and use in source and binary forms with or without
modification are permitted provided that the following conditions
are met:
diff --git a/debian/patches/kde-install-dirs.diff b/debian/patches/kde-install-dirs.diff
deleted file mode 100644
index 0aba574..0000000
--- a/debian/patches/kde-install-dirs.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-Index: extra-cmake-modules-1.0.0/kde-modules/KDEInstallDirs.cmake
-===================================================================
---- extra-cmake-modules-1.0.0.orig/kde-modules/KDEInstallDirs.cmake
-+++ extra-cmake-modules-1.0.0/kde-modules/KDEInstallDirs.cmake
-@@ -323,16 +323,16 @@ _define_relative(CMAKEPACKAGEDIR LIBDIR
- CMAKECONFIG_INSTALL_PREFIX)
-
- # Qt-specific vars
--_define_relative(QTPLUGINDIR LIBDIR "plugins"
-+_define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
- "Qt plugins"
- QT_PLUGIN_INSTALL_DIR)
- _define_relative(PLUGINDIR QTPLUGINDIR ""
- "Plugins"
- PLUGIN_INSTALL_DIR)
--_define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
-+_define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
- "QtQuick1 imports"
- IMPORTS_INSTALL_DIR)
--_define_relative(QMLDIR LIBDIR "qml"
-+_define_relative(QMLDIR LIBDIR "qt5/qml"
- "QtQuick2 imports"
- QML_INSTALL_DIR)
-
-@@ -432,7 +432,7 @@ _define_relative(DBUSSYSTEMSERVICEDIR DB
-
-
-
--_define_absolute(SYSCONFDIR "etc"
-+_define_absolute(SYSCONFDIR "/etc"
- "read-only single-machine data"
- SYSCONF_INSTALL_DIR)
- _define_relative(CONFDIR SYSCONFDIR "xdg"
-Index: extra-cmake-modules-1.0.0/modules/ECMGeneratePriFile.cmake
-===================================================================
---- extra-cmake-modules-1.0.0.orig/modules/ECMGeneratePriFile.cmake
-+++ extra-cmake-modules-1.0.0/modules/ECMGeneratePriFile.cmake
-@@ -82,7 +82,7 @@
- # (To distribute this file outside of extra-cmake-modules, substitute the full
- # License text for the above reference.)
-
--set(ECM_MKSPECS_INSTALL_DIR mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.")
-+set(ECM_MKSPECS_INSTALL_DIR ${LIB_INSTALL_DIR}/qt5/mkspecs/modules CACHE PATH "The directory where mkspecs will be installed to.")
-
- function(ECM_GENERATE_PRI_FILE)
- set(options )
-Index: extra-cmake-modules-1.0.0/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt
-===================================================================
---- extra-cmake-modules-1.0.0.orig/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt
-+++ extra-cmake-modules-1.0.0/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt
-@@ -12,10 +12,8 @@ set(misc_vars
-
- set(relative_path_vars
- # old-style variables
-- AUTOSTART_INSTALL_DIR
- BIN_INSTALL_DIR
- CMAKECONFIG_INSTALL_PREFIX
-- CONFIG_INSTALL_DIR
- DATA_INSTALL_DIR
- DBUS_INTERFACES_INSTALL_DIR
- DBUS_SERVICES_INSTALL_DIR
-@@ -43,7 +41,6 @@ set(relative_path_vars
- SERVICETYPES_INSTALL_DIR
- SHARE_INSTALL_PREFIX
- SOUND_INSTALL_DIR
-- SYSCONF_INSTALL_DIR
- TEMPLATES_INSTALL_DIR
- WALLPAPER_INSTALL_DIR
- XDG_APPS_INSTALL_DIR
-@@ -52,10 +49,8 @@ set(relative_path_vars
-
- # new-style variables
- CMAKE_INSTALL_APPDIR
-- CMAKE_INSTALL_AUTOSTARTDIR
- CMAKE_INSTALL_BINDIR
- CMAKE_INSTALL_CMAKEPACKAGEDIR
-- CMAKE_INSTALL_CONFDIR
- CMAKE_INSTALL_DATADIR
- CMAKE_INSTALL_DATADIR_KF5
- CMAKE_INSTALL_DATAROOTDIR
-@@ -89,7 +84,6 @@ set(relative_path_vars
- CMAKE_INSTALL_SBINDIR
- CMAKE_INSTALL_SHAREDSTATEDIR
- CMAKE_INSTALL_SOUNDDIR
-- CMAKE_INSTALL_SYSCONFDIR
- CMAKE_INSTALL_TEMPLATEDIR
- CMAKE_INSTALL_WALLPAPERDIR
- )
-@@ -133,7 +127,6 @@ set(absolute_path_vars
- CMAKE_INSTALL_FULL_SBINDIR
- CMAKE_INSTALL_FULL_SHAREDSTATEDIR
- CMAKE_INSTALL_FULL_SOUNDDIR
-- CMAKE_INSTALL_FULL_SYSCONFDIR
- CMAKE_INSTALL_FULL_TEMPLATEDIR
- CMAKE_INSTALL_FULL_WALLPAPERDIR
- )
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2314719..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-kde-install-dirs.diff
-upstream_Check-the-libdir-also-on-kFreeBSD-and-Hurd.patch
diff --git a/debian/patches/upstream_Check-the-libdir-also-on-kFreeBSD-and-Hurd.patch b/debian/patches/upstream_Check-the-libdir-also-on-kFreeBSD-and-Hurd.patch
deleted file mode 100644
index c02928b..0000000
--- a/debian/patches/upstream_Check-the-libdir-also-on-kFreeBSD-and-Hurd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d5582bb3b1d3132dab8f8486729f62c8b8530da3 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 19 Jul 2014 16:45:19 +0200
-Subject: [PATCH] Check the libdir also on kFreeBSD and Hurd
-
-This way, on the Debian versions of these OSes, the library directory
-can be a multiarch path.
----
- kde-modules/KDEInstallDirs.cmake | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index 25b308b..880539b 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -173,14 +173,15 @@
- # by the _define_* macros in this module).
- set(_LIBDIR_DEFAULT "lib")
- # Override this default 'lib' with 'lib64' iff:
--# - we are on Linux system but NOT cross-compiling
-+# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
- # - we are NOT on debian
- # - we are on a 64 bits system
- # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
- # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
- # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
- # See http://wiki.debian.org/Multiarch
--if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_CROSSCOMPILING)
-+if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
-+ AND NOT CMAKE_CROSSCOMPILING)
- if (EXISTS "/etc/debian_version") # is this a debian system ?
- if(CMAKE_LIBRARY_ARCHITECTURE)
- set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
---
-2.0.1
-
diff --git a/debian/rules b/debian/rules
index 7f4a67a..02924bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
#!/usr/bin/make -f
# -*- makefile -*-
-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
diff --git a/debian/watch b/debian/watch
index d00a676..47b83dd 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-http://download.kde.org/stable/frameworks/([\d.]*)/extra-cmake-modules-([\d.]*)\.tar\.xz
+http://download.kde.org/stable/frameworks/([\d\.]*)/extra-cmake-modules-(.*)\.tar\.xz
+
--
extra-cmake-modules packaging
More information about the pkg-kde-commits
mailing list