[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.10.5-1

Pino Toscano pino at alioth.debian.org
Sat Jul 13 13:18:36 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=05b1fbb

The following commit has been merged in the master branch:
commit 05b1fbb6b1ffd568573135459760daa71e3974f3
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed May 8 14:00:55 2013 +0200

    Add DEP3 headers.
---
 debian/changelog                                            |    1 +
 debian/patches/be_better_at_honouring_user_kdm_theming.diff |    4 ++++
 debian/patches/enable_debianabimanager.diff                 |    1 +
 debian/patches/fix_target_link_libraries.diff               |    4 ++++
 debian/patches/genkdmconf.diff                              |    4 ++++
 debian/patches/kdm_X_path.diff                              |    4 ++++
 debian/patches/kdm_does_not_wreak_havoc.diff                |    4 ++++
 debian/patches/kdm_no_custom.diff                           |    4 ++++
 debian/patches/kdm_override_docs.diff                       |    4 ++++
 debian/patches/kdmrc_defaults.diff                          |    4 ++++
 debian/patches/use_dejavu_as_default_font.diff              |    4 ++++
 11 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e80b1a1..bad1849 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ kde-workspace (4:4.10.3-1) UNRELEASED; urgency=low
   * Small fix in kdm manpage.
   * Reshuffle build-deps to reduce resolver tries.
   * Update libkwineffects1abi4 symbols file.
+  * Add DEP3 headers.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 08 May 2013 11:47:11 +0200
 
diff --git a/debian/patches/be_better_at_honouring_user_kdm_theming.diff b/debian/patches/be_better_at_honouring_user_kdm_theming.diff
index e1b5294..044d68d 100644
--- a/debian/patches/be_better_at_honouring_user_kdm_theming.diff
+++ b/debian/patches/be_better_at_honouring_user_kdm_theming.diff
@@ -1,3 +1,7 @@
+From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Subject: Honour user KDM themeing
+Forwarded: not-needed
+Last-Update: 2013-02-15
 --- a/kdm/config.def
 +++ b/kdm/config.def
 @@ -2688,7 +2688,7 @@ Key: Theme
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
index adbf75e..139611b 100644
--- a/debian/patches/enable_debianabimanager.diff
+++ b/debian/patches/enable_debianabimanager.diff
@@ -1,6 +1,7 @@
 From: Modestas Vainius <modax at debian.org>
 Subject: Use DebianABIManager for this source package. It's Debian-specific.
 Forwarded: not-needed
+Last-Update: 2013-02-15
 
 For more information about DebianABIManager, refer to
 /usr/share/doc/pkg-kde-tools/README.DebianABIManager (pkg-kde-tools (>= 0.12)).
diff --git a/debian/patches/fix_target_link_libraries.diff b/debian/patches/fix_target_link_libraries.diff
index 1d20f07..ea288cb 100644
--- a/debian/patches/fix_target_link_libraries.diff
+++ b/debian/patches/fix_target_link_libraries.diff
@@ -1,3 +1,7 @@
+From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Subject: Fix target link libraries
+Forwarded: not-needed
+Last-Update: 2012-01-30
 --- a/libs/kworkspace/CMakeLists.txt
 +++ b/libs/kworkspace/CMakeLists.txt
 @@ -51,6 +51,7 @@ qt4_add_dbus_interface( kworkspace_LIB_S
diff --git a/debian/patches/genkdmconf.diff b/debian/patches/genkdmconf.diff
index c513f63..0b694d9 100644
--- a/debian/patches/genkdmconf.diff
+++ b/debian/patches/genkdmconf.diff
@@ -1,3 +1,7 @@
+From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Subject: Debian specific configurations and expected behaviour
+Forwarded: not-needed
+Last-Update: 2012-06-05
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
 @@ -622,7 +622,7 @@ static const char def_xaccess[] =
diff --git a/debian/patches/kdm_X_path.diff b/debian/patches/kdm_X_path.diff
index 739f27a..eef0c9e 100644
--- a/debian/patches/kdm_X_path.diff
+++ b/debian/patches/kdm_X_path.diff
@@ -1,3 +1,7 @@
+From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Subject: Fallback to default X location (Debian specific)
+Forwarded: not-needed
+Last-Update: 2011-08-29
 --- a/kdm/backend/dm.c
 +++ b/kdm/backend/dm.c
 @@ -629,7 +629,13 @@ startRemoteLogin(struct display *d)
diff --git a/debian/patches/kdm_does_not_wreak_havoc.diff b/debian/patches/kdm_does_not_wreak_havoc.diff
index bef2849..f6ccda5 100644
--- a/debian/patches/kdm_does_not_wreak_havoc.diff
+++ b/debian/patches/kdm_does_not_wreak_havoc.diff
@@ -1,3 +1,7 @@
+From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Subject: Comment out error message
+Forwarded: not-needed
+Last-Update: 2012-06-05
 --- a/kdm/kfrontend/genkdmconf.c
 +++ b/kdm/kfrontend/genkdmconf.c
 @@ -3154,9 +3154,11 @@ int main(int argc, char **argv)
diff --git a/debian/patches/kdm_no_custom.diff b/debian/patches/kdm_no_custom.diff
index f6ffbc5..50e6ff2 100644
--- a/debian/patches/kdm_no_custom.diff
+++ b/debian/patches/kdm_no_custom.diff
@@ -1,3 +1,7 @@
+From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Subject: Remove custom sessions, Xsession manages this in Debian
+Forwarded: not-needed
+Last-Update: 2011-03-29
 --- a/kdm/kfrontend/kgreeter.cpp
 +++ b/kdm/kfrontend/kgreeter.cpp
 @@ -451,7 +451,6 @@ void
diff --git a/debian/patches/kdm_override_docs.diff b/debian/patches/kdm_override_docs.diff
index f40078e..8cde440 100644
--- a/debian/patches/kdm_override_docs.diff
+++ b/debian/patches/kdm_override_docs.diff
@@ -1,3 +1,7 @@
+From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Subject: Add Debian specific information
+Forwarded: not-needed
+Last-Update: 2011-06-12
 --- a/kdm/config.def
 +++ b/kdm/config.def
 @@ -92,6 +92,12 @@
diff --git a/debian/patches/kdmrc_defaults.diff b/debian/patches/kdmrc_defaults.diff
index ce0e891..1b948a8 100644
--- a/debian/patches/kdmrc_defaults.diff
+++ b/debian/patches/kdmrc_defaults.diff
@@ -1,3 +1,7 @@
+From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Subject: Sets Debian specific defaults
+Forwarded: not-needed
+Last-Update: 2012-11-26
 --- a/kdm/config.def
 +++ b/kdm/config.def
 @@ -52,11 +52,11 @@
diff --git a/debian/patches/use_dejavu_as_default_font.diff b/debian/patches/use_dejavu_as_default_font.diff
index 4816ddc..0153077 100644
--- a/debian/patches/use_dejavu_as_default_font.diff
+++ b/debian/patches/use_dejavu_as_default_font.diff
@@ -1,3 +1,7 @@
+From: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Subject: Use dejavu as default font
+Forwarded: not-needed
+Last-Update: 2013-02-15
 --- a/kcontrol/fonts/fonts.cpp
 +++ b/kcontrol/fonts/fonts.cpp
 @@ -525,13 +525,13 @@ KFonts::KFonts(QWidget *parent, const QV

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list