[SCM] kde-gtk-config packaging branch, master, updated. debian/5.2.0-1-27-g5aa1162
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Mar 26 12:42:28 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kde-gtk-config.git;a=commitdiff;h=c639abc
The following commit has been merged in the master branch:
commit c639abc8dac152066eb19d56bd0e96a55d13fb9e
Merge: 9e67cdab948ba4828e6608f350cc552e82ea36ff 5ade2613612c8f3c7e2b17164cf41e89fba1dd9e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Mar 25 10:33:56 2015 +0100
Merge commit '5ade2613612c8f3c7e2b17164cf41e89fba1dd9e'
Conflicts:
debian/control
debian/copyright
debian/kde-config-gtk-style.install
debian/patches/series
debian/rules
debian/tests/control
debian/tests/testsuite.xsession
debian/watch
debian/changelog | 12 +++++++
debian/copyright | 92 ++++++++++++++++++++++++++++------------------------
debian/tests/control | 2 +-
3 files changed, 63 insertions(+), 43 deletions(-)
diff --cc debian/changelog
index fe2a931,c5154ab..efef4d6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,15 +1,34 @@@
+kde-gtk-config (4:5.2.2-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.2.1).
+ * New patch: fix_fonthelper
+ * New upstream release (5.2.2).
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 25 Mar 2015 09:58:28 +0100
+
+ kde-gtk-config (4:5.2.2-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Tue, 24 Mar 2015 07:12:23 -0700
+
+ kde-gtk-config (4:5.2.1-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Mon, 23 Feb 2015 09:36:51 -0800
+
+kde-gtk-config (4:5.2.0-1) experimental; urgency=medium
+
+ * Prepare initial Debian release.
+ * Add myself as Uploader.
+ * Update build dependencies to build against experimental and to
+ follow cmake.
+ * Update copyright information.
+ * Update install files.
+
+ -- Maximiliano Curia <maxy at debian.org> Mon, 09 Feb 2015 00:40:29 +0100
+
kde-gtk-config (4:5.2.0-0ubuntu1) vivid; urgency=medium
* New upstream release
diff --cc debian/copyright
index 55e1395,fa42005..f603409
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,102 -1,123 +1,110 @@@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Debianized-By: Boris Pek <tehnick-8 at mail.ru>
Debianized-Date: Wed, 08 Feb 2012 00:15:14 +0200
-Upstream-Name: KDE GTK Configurator
+Upstream-Name: kde-gtk-config
Upstream-Contact: Jose Antonio Sánchez Reynaga <joanzare at gmail.com>
Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-Source: https://projects.kde.org/projects/extragear/base/kde-gtk-config
- The orig.tar.bz2 is just renamed upstream tarball (without changes).
- See section get-orig-source in debian/rules file for details.
+Source: git://anongit.kde.org/kde-gtk-config
Files: *
-Copyright: 2011 Jose Antonio Sánchez Reynaga <joanzare at gmail.com>
- 2011 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-License: GPL-3+
+Copyright: 2011-2013, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+ 2011, José Antonio Sanchez Reynaga <joanzare at gmail.com>
+License: LGPL-2.1+3+KDEeV
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) version 3, or any
- later version accepted by the membership of KDE e.V. (or its
- successor approved by the membership of KDE e.V.), which shall
- act as a proxy defined in Section 6 of version 3 of the license.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General Public License
- version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1', likewise,
- the complete text of the GNU Lesser General Public License version 3 can be
- found in `/usr/share/common-licenses/LGPL-3'.
-Files: gtk3proxies/* gtkproxies/*
-Copyright: 2011 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-License: GPL-2 or GPL-3+
+Files: gtk3proxies/preview3.c
+ gtkproxies/preview.c
+ gtkproxies/reload.c
+Copyright: 2011, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+License: GPL-2+3+KDEeV
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License or (at your option) version 3 or any later version
- accepted by the membership of KDE e.V. (or its successor approved
- by the membership of KDE e.V.), which shall act as a proxy
- defined in Section 14 of version 3 of the license.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in `/usr/share/common-licenses/GPL-2', likewise, the
- complete text of the GNU General Public License version 3 can be found in
- `/usr/share/common-licenses/GPL-3'.
+
+Files: cmake/modules/FindGTK2.cmake
+Copyright: 2009, Kitware, Inc
+ 2008-2009, Philip Lowman <philip at yhbt.com>
+License: BSD-3-clause
++
++Files: debian/*
++Copyright: 2012-2013, Boris Pek <tehnick-8 at mail.ru>
++License: GPL-2+
++
++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:
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
- Files: debian/*
- Copyright: 2012-2013, Boris Pek <tehnick-8 at mail.ru>
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation, either version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL-2'.
++
++License: GPL-2+3+KDEeV
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License or (at your option) version 3 or any later version
+ accepted by the membership of KDE e.V. (or its successor approved
+ by the membership of KDE e.V.), which shall act as a proxy
+ defined in Section 14 of version 3 of the license.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
- On Debian systems, the complete text of the GNU Lesser General Public License
- can be found in `/usr/share/common-licenses/LGPL-3'.
- .
+ On Debian systems, the complete text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL-3'.
++ version 2 can be found in `/usr/share/common-licenses/GPL-2', likewise, the
++ complete text of the GNU General Public License version 3 can be found in
++ `/usr/share/common-licenses/GPL-3'.
+
-Files: src/*
-Copyright: 2011 Jose Antonio Sánchez Reynaga <joanzare at gmail.com>
- 2011 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-License: LGPL-2.1 or LGPL-3+
++License: LGPL-2.1+3+KDEeV
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
-
-Files: cmake/modules/FindGTK*.cmake
-Copyright: 2009 Kitware, Inc.
- Copyright 2008-2009 Philip Lowman <philip at yhbt.com>
-License: BSD-3-clause
-
-Files: debian/*
-Copyright: 2012-2013 Boris Pek <tehnick-8 at mail.ru>
-License: GPL-2+
-
-License: GPL-3+
- This program is free software: you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation, either version 3 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL-3'.
-
-License: GPL-2+
- This program is free software: you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation, either version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>.
+ .
- On Debian systems, the complete text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL-2'.
-
-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:
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
++ On Debian systems, the complete text of the GNU Lesser General Public License
++ version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1', likewise,
++ the complete text of the GNU Lesser General Public License version 3 can be
++ found in `/usr/share/common-licenses/LGPL-3'.
diff --cc debian/tests/control
index 2367983,7f4efe0..2d90043
--- a/debian/tests/control
+++ b/debian/tests/control
@@@ -1,4 -1,4 +1,4 @@@
Tests: testsuite
--Depends: @builddeps@, build-essential,
- xvfb, xauth, dbus-x11, openbox, ttf-oxygen-font-family
++Depends: @, @builddeps@, build-essential,
+ xvfb, xauth, dbus-x11, openbox, fonts-oxygen
Restrictions: rw-build-tree
--
kde-gtk-config packaging
More information about the pkg-kde-commits
mailing list