rev 11741 - in branches/kde4/packages/systemsettings/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-07-26 07:14:40 +0000 (Sat, 26 Jul 2008)
New Revision: 11741

Modified:
   branches/kde4/packages/systemsettings/debian/changelog
   branches/kde4/packages/systemsettings/debian/patches/orig_tar_gz.diff
   branches/kde4/packages/systemsettings/debian/rules
Log:
* New upstream release.
+++ Changes by Modestas Vainius:
* Adapt orig_tar_gz.diff patch to upstream changes.

Modified: branches/kde4/packages/systemsettings/debian/changelog
===================================================================
--- branches/kde4/packages/systemsettings/debian/changelog	2008-07-26 04:02:07 UTC (rev 11740)
+++ branches/kde4/packages/systemsettings/debian/changelog	2008-07-26 07:14:40 UTC (rev 11741)
@@ -1,3 +1,13 @@
+systemsettings (4.1.0-0r1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Modestas Vainius:
+
+  * Adapt orig_tar_gz.diff patch to upstream changes.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Sat, 26 Jul 2008 09:56:19 +0300
+
 systemsettings (4.0.98-2) unstable; urgency=low
 
   +++ Changes by Modestas Vainius:

Modified: branches/kde4/packages/systemsettings/debian/patches/orig_tar_gz.diff
===================================================================
--- branches/kde4/packages/systemsettings/debian/patches/orig_tar_gz.diff	2008-07-26 04:02:07 UTC (rev 11740)
+++ branches/kde4/packages/systemsettings/debian/patches/orig_tar_gz.diff	2008-07-26 07:14:40 UTC (rev 11741)
@@ -16,7 +16,7 @@
  
  include (MacroLibrary)
  include (KDE4Defaults)
-@@ -23,77 +21,17 @@
+@@ -23,79 +21,17 @@
      if (NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
          set(EXPORT_XCURSOR_PATH "export XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"")
      endif (NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
@@ -79,11 +79,13 @@
 -macro_optional_add_subdirectory( wallpapers )
 -
 -if(X11_Xau_FOUND AND X11_Xdmcp_FOUND)
--  	add_subdirectory( kdm )
+-    add_subdirectory( kdm )
 -else(X11_Xau_FOUND AND X11_Xdmcp_FOUND)
--	MESSAGE(STATUS "Xau lib or Xdmcp lib was missing. kdm will not compile")
+-    message(STATUS "Xau lib or Xdmcp lib was missing. kdm will not compile")
 -endif(X11_Xau_FOUND AND X11_Xdmcp_FOUND)
 -
+-# This line looks very wrong, it should go.
+-# Does anybody know why it's here ? If so, let me know. Alex
 -SET(krunner_DEPENDS "plasma")
 -
 -########### install files ###############

Modified: branches/kde4/packages/systemsettings/debian/rules
===================================================================
--- branches/kde4/packages/systemsettings/debian/rules	2008-07-26 04:02:07 UTC (rev 11740)
+++ branches/kde4/packages/systemsettings/debian/rules	2008-07-26 07:14:40 UTC (rev 11741)
@@ -35,7 +35,7 @@
 		-name "ConfigureChecks.cmake" -o \
 		-name "COPYING*" \) -exec rm -rf {} \;
 	# Apply orig_tar_gz patch
-	if [ -f "$(ORIG_TAR_GZ_PATCH)" ]; then patch -p1 --no-backup-if-mismatch -r /dev/null < "$(ORIG_TAR_GZ_PATCH)"; fi
+	if [ -f "$(ORIG_TAR_GZ_PATCH)" ]; then patch -p1 --no-backup-if-mismatch < "$(ORIG_TAR_GZ_PATCH)"; fi
 	# Create a tarball as ../$(TARBALL_NAME)
 	cd .. && \
 		if [ "$(DIR_NAME)" != "$(CURDIR_NAME)" ]; then mv "$(CURDIR_NAME)" "$(DIR_NAME)"; fi && \