[SCM] libkscreen packaging branch, master, updated. c0f29a8001687c3908bebe1d3923af3be84673e3
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Dec 5 21:18:30 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libkscreen.git;a=commitdiff;h=c0f29a8
The following commit has been merged in the master branch:
commit c0f29a8001687c3908bebe1d3923af3be84673e3
Merge: 0ec4875bfc54eb82a6506efa9bddf6708632cd08 1f2d0cbd42e6a8e352e7e4de9673a8b81f9139db
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Thu Dec 5 22:14:22 2013 +0100
Merge branch 'master' into HEAD
Conflicts:
debian/TODO.Debian
debian/changelog
debian/control
debian/copyright
debian/libkscreen-dev.install
debian/libkscreen1.install
debian/rules
debian/watch
debian/TODO.Debian | 15 ------
debian/changelog | 9 +++-
debian/control | 47 +++++++++++++++---
debian/copyright | 53 ++++++++++----------
debian/libkscreen-dev.install | 4 +-
debian/libkscreen1.install | 5 +-
debian/patches/libdir.diff | 44 +++++++++++++++++
debian/patches/plugins_in_ma_paths.diff | 86 +++++++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/rules | 12 +++--
debian/watch | 4 +-
11 files changed, 220 insertions(+), 61 deletions(-)
diff --cc debian/changelog
index b9167df,5b108ff..777d6ea
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,7 +1,10 @@@
-libkscreen (1.0.2-1) UNRELEASED; urgency=low
+libkscreen (1.0.2-1) unstable; urgency=low
- * Initial package (Closes: #730356)
- * Initial release.
++ [ Rohan Garg ]
++ * Initial package (Closes: #731478)
+
- -- Rohan Garg <rohan at kde.org> Sat, 23 Nov 2013 06:51:18 +1100
++ [ Maximiliano Curia ]
+ * New patch: libdir.diff, install in the m-a paths.
+ * New patch: plugins_in_ma_paths.diff.
+
+ -- Maximiliano Curia <maxy at debian.org> Thu, 05 Dec 2013 12:52:48 +0100
diff --cc debian/control
index b85179a,bb1439a..43670b8
--- a/debian/control
+++ b/debian/control
@@@ -1,13 -1,39 +1,41 @@@
Source: libkscreen
+ Section: libs
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
- Uploaders: Felix Geyer <fgeyer at debian.org>, Rohan Garg <rohan at kde.org>
- Build-Depends: debhelper (>= 9), cmake, kdelibs5-dev, libqjson-dev (>= 0.8.0), libxrandr-dev, pkg-kde-tools, pkg-config, libx11-xcb-dev, libxcb-render-util0-dev, libxcb-image0-dev, libxcb-randr0-dev, libxcb-composite0-dev, libxcb-damage0-dev, libxcb-shape0-dev, libxcb-shm0-dev, libxcb-sync0-dev, libxcb-xfixes0-dev, libxcb1-dev, xcb-proto
- Standards-Version: 3.9.4
- Section: libs
- Homepage: https://projects.kde.org/projects/playground/libs/libkscreen
-Uploaders: Maximiliano Curia <maxy at debian.org>
++Uploaders: Felix Geyer <fgeyer at debian.org>,
++ Rohan Garg <rohan at kde.org>,
++ Maximiliano Curia <maxy at debian.org>
+ Build-Depends: debhelper (>= 9),
+ cmake (>= 2.8.0),
+ pkg-kde-tools,
+ kdelibs5-dev,
+ libqjson-dev (>= 0.8.0),
+ libxrandr-dev,
+ pkg-config,
+ libx11-xcb-dev,
+ libxcb1-dev,
+ libxcb-composite0-dev,
+ libxcb-damage0-dev,
+ libxcb-dri2-0-dev,
+ libxcb-ewmh-dev,
+ libxcb-glx0-dev,
+ libxcb-icccm4-dev,
+ libxcb-image0-dev,
+ libxcb-randr0-dev,
+ libxcb-render0-dev,
+ libxcb-render-util0-dev,
+ libxcb-shape0-dev,
+ libxcb-shm0-dev,
+ libxcb-sync0-dev,
+ libxcb-util0-dev,
+ libxcb-xfixes0-dev,
+ libxcb-xtest0-dev,
+ libxcb-xv0-dev,
+ xcb-proto
+ Standards-Version: 3.9.5
-Homepage: https://projects.kde.org/projects/playground/libs/libkscreen
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/libkscreen.git
++Homepage: https://projects.kde.org/projects/extragear/libs/libkscreen
Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/libkscreen.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/libkscreen.git;a=summary
++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/libkscreen.git
Package: libkscreen-dev
Section: libdevel
@@@ -22,7 -48,11 +50,9 @@@ Description: library for screen managem
Package: libkscreen1
Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: libkscreen0
-Replaces: libkscreen0
Description: library for screen management - shared library
The KDE multiple monitor support is trying be as smart as possible
adapting the behavior of it to each use case making the configuration
diff --cc debian/copyright
index e1dd73d,6d5cfd7..a29dbb5
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,11 -1,11 +1,11 @@@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libkscreen
--Source: ftp://ftp.kde.org/pub/kde/unstable/libkscreen/
++Source: ftp://ftp.kde.org/pub/kde/stable/libkscreen/
Files: *
- Copyright: 2012 Alejandro Fiestas Olivares <afiestas at kde.org>
- 2012, 2013 Dan Vratil <dvratil at redhat.com>
- 2012, 2013 Martin Gräßlin <mgraesslin at kde.org>
+ Copyright: 2012, Alejandro Fiestas Olivares <afiestas at kde.org>
+ 2012, Daniel Nicoletti <dantti12 at gmail.com>
+ 2012-2013, Daniel Vratil <dvratil at redhat.com>
License: LGPL-2.1+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
diff --cc debian/libkscreen-dev.install
index 97ff800,0f67bbc..01e8a8d
--- a/debian/libkscreen-dev.install
+++ b/debian/libkscreen-dev.install
@@@ -1,4 -1,6 +1,4 @@@
-usr/include/*
-#usr/lib/lib*.a
+usr/include/kscreen/
- usr/lib/libkscreen.so
+usr/lib/cmake/LibKScreen/
- usr/lib/pkgconfig/kscreen.pc
+ usr/lib/*/libkscreen.so
-usr/lib/cmake/LibKScreen/*
-usr/lib/*/pkgconfig/*
-#usr/share/pkgconfig/*
++usr/lib/*/pkgconfig/kscreen.pc
diff --cc debian/rules
index 3fd2501,7c56da1..35348ff
--- a/debian/rules
+++ b/debian/rules
@@@ -1,16 -1,19 +1,22 @@@
#!/usr/bin/make -f
# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
+ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
%:
- dh $@ --with=pkgkde-symbolshelper --parallel
+ dh $@ --parallel \
- --dbg-package=libkscreen-dbg \
- --list-missing \
+ --with kde,pkgkde-symbolshelper
- override_dh_auto_test:
- # requires an X server
+ override_dh_auto_configure:
+ dh_auto_configure -- -DLIB_DESTINATION=/usr/lib/$(DEB_HOST_MULTIARCH)
-# Tests require kscreen
+override_dh_install:
+ dh_install --fail-missing
+
+override_dh_strip:
+ dh_strip --dbg-package=libkscreen-dbg
++
++# Tests require libkscreen backends installed, even with xvfb-run
+ .PHONY: override_dh_auto_test
--
libkscreen packaging
More information about the pkg-kde-commits
mailing list