[SCM] KDE Artwork module packaging branch, master, updated. debian/4.4.5-1-35-g0c48746

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Fri Mar 4 19:08:43 UTC 2011


The following commit has been merged in the master branch:
commit e372789159dc3642c58b04e1f20876576de23d64
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Mar 4 18:12:38 2011 +0100

    Remove 01_kxsconfig_fix_screensavers_lookup.diff, no longer needed.
---
 debian/changelog                                   |    1 +
 .../01_kxsconfig_fix_screensavers_lookup.diff      |   17 -----------------
 debian/patches/series                              |    1 -
 3 files changed, 1 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6be75d8..489ed9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ kdeartwork (4:4.6.1-0r0) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.1: add Breaks next to Replaces where needed.
   * Bump kde-sc-dev-latest build dependency to 4:4.6.1.
   * Add debian/not-installed.
+  * Remove 01_kxsconfig_fix_screensavers_lookup.diff, no longer needed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 01 Sep 2010 23:03:08 +0300
 
diff --git a/debian/patches/01_kxsconfig_fix_screensavers_lookup.diff b/debian/patches/01_kxsconfig_fix_screensavers_lookup.diff
deleted file mode 100644
index 1d60aee..0000000
--- a/debian/patches/01_kxsconfig_fix_screensavers_lookup.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Modestas Vainius <modax at debian.org>
-Description: fix lookup of xscreensavers
- find_file(XSCREENSAVER_FILE_FOUND) sets CACHE value and does nothing if
- XSCREENSAVER_FILE_FOUND is set. Therefore, it must be unset for the next
- find_file() call to be effective after previous successful call.
-Applied-Upstream: 4.6.1
-
---- a/kscreensaver/kxsconfig/CMakeLists.txt
-+++ b/kscreensaver/kxsconfig/CMakeLists.txt
-@@ -39,6 +39,7 @@ foreach(_currentdesktopfile ${_desktopfi
- 	#MESSAGE(STATUS "newItem <${_newitem}>")
- 	GET_FILENAME_COMPONENT(_screensaverName ${_newitem} NAME_WE)
- 	#MESSAGE(STATUS "name without extension <${_screensaverName}>")
-+   unset(XSCREENSAVER_FILE_FOUND CACHE)
- 	find_file(XSCREENSAVER_FILE_FOUND ${_screensaverName}.xml PATHS ${XSCREENSAVER_CONFIG_DIR} )
- 	if(XSCREENSAVER_FILE_FOUND)
- 		MESSAGE(STATUS "xscreensaver name ${_screensaverName} found")
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4e46d16..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_kxsconfig_fix_screensavers_lookup.diff

-- 
KDE Artwork module packaging



More information about the pkg-kde-commits mailing list