[SCM] KDE Localization module packaging branch, master, updated. debian/4%17.08.3-3

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 76718580b56a84304c160656ce2f4e6f5962b227
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 24 11:30:25 2012 +0300

    Release with KDE PIMi 4.8.4 translations.
    
    This commits drops patches which were used to exclude kdepim and kdepim-runtime
    translations from the final l10n packages.
---
 debian/changelog            |  1 +
 debian/cmake/FindKDE4.cmake | 29 -----------------------------
 debian/rules                |  6 ++----
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a78b60b..b0d1029 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 kde-l10n (4:4.8.4-2++pim1) UNRELEASED; urgency=low
 
+  * Release with KDE PIM 4.8.4 translations.
 
  -- Modestas Vainius <modax at debian.org>  Sun, 24 Jun 2012 11:23:26 +0300
 
diff --git a/debian/cmake/FindKDE4.cmake b/debian/cmake/FindKDE4.cmake
deleted file mode 100644
index d7476fa..0000000
--- a/debian/cmake/FindKDE4.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-# Parameters
-# DEBIAN_EXCLUDE_DIRS - a list of subdirectories to exclude from subprojects.
-#                       This can be used to exclude specific KDE modules from
-#                       the build.
-
-# Shut up cmake about empty subdirectories
-cmake_policy(SET CMP0014 OLD)
-
-# Override add_subdirectory() built-in function
-function(add_subdirectory subdir)
-	# Do not add directory if it's in the DEBIAN_EXCLUDE_DIRS list
-	set(add_this_dir 1)
-	foreach (dir ${DEBIAN_EXCLUDE_DIRS})
-		if (${dir} STREQUAL ${subdir})
-			set(add_this_dir 0)
-			break()
-		endif(${dir} STREQUAL ${subdir})
-	endforeach (dir ${DEBIAN_EXCLUDE_DIRS})
-	if (add_this_dir)
-		_add_subdirectory(${subdir})
-	else (add_this_dir)
-		# Get directory name
-		file(RELATIVE_PATH parent_dir ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-		message(STATUS "${PROJECT_NAME}: excluding directory ${parent_dir}/${subdir}")
-	endif (add_this_dir)
-endfunction(add_subdirectory)
-
-# Include system FindKDE4.cmake
-include("${CMAKE_ROOT}/Modules/FindKDE4.cmake")
diff --git a/debian/rules b/debian/rules
index 5506873..111fdd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ L10N_Recommends :=
 L10N_Suggests := kde-standard
 L10N_Replaces := okular-l10n, gwenview-i18n, filelight-l10n, konq-plugins-l10n
 L10N_Breaks := okular-l10n, gwenview-i18n, filelight-l10n, konq-plugins-l10n
-L10N_Provides := kde-l10n-without-pim
+L10N_Provides := kde-l10n
 
 L10N_PREFIX := kde-l10n
 #L10N_VERSION := $(shell cat debian/changelog | head -n1 | sed 's/.*(\([[:digit:]]\+:\)\?\(.\+\)-.\+).*//')
@@ -52,9 +52,7 @@ build: $(STAMP_BUILD)
 build_progress = [$(shell ls -1 -d debian/stamp__*__build debian | wc -l)/$(words $(STAMP_BUILD))]
 $(STAMP_BUILD): | prepare_build
 	# $(build_progress) Building '$(cur_lang)' language ...
-	dh_auto_configure -Scmake -D$(cur_lang) -B$(cur_lang_builddir) -- -DCMAKE_BUILD_TYPE=Debian \
-	    -DCMAKE_MODULE_PATH='$(CURDIR)/debian/cmake' \
-	    -DDEBIAN_EXCLUDE_DIRS='kdepim-runtime;kdepim'
+	dh_auto_configure -Scmake -D$(cur_lang) -B$(cur_lang_builddir) -- -DCMAKE_BUILD_TYPE=Debian
 	$(MAKE) -C $(cur_lang_builddir)
 	# $(build_progress) Built '$(cur_lang)' language.
 	touch $@

-- 
KDE Localization module packaging