packages: systemd/udevlibexecdir.patch - fix more breakage

[baggins]

Author: baggins                      Date: Tue May 29 10:53:11 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix more breakage

---- Files affected:
packages/systemd:
   udevlibexecdir.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/systemd/udevlibexecdir.patch
diff -u packages/systemd/udevlibexecdir.patch:1.1 packages/systemd/udevlibexecdir.patch:1.2
--- packages/systemd/udevlibexecdir.patch:1.1	Mon May 28 14:57:45 2012
+++ packages/systemd/udevlibexecdir.patch	Tue May 29 12:53:06 2012
@@ -11,6 +11,15 @@
  
  # And these are the special ones for /
  rootprefix=@rootprefix@
+@@ -131,7 +131,7 @@
+ 	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+ 	-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
+ 	-DX_SERVER=\"$(bindir)/X\" \
+-	-DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
++	-DUDEVLIBEXECDIR=\""$(udevlibexecdir)"\" \
+ 	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+ 	-I $(top_srcdir)/src \
+ 	-I $(top_srcdir)/src/shared \
 @@ -1434,7 +1434,7 @@
  
  udev-confdirs:
@@ -38,3 +47,23 @@
  dist_udevkeymapforcerel_DATA = \
  	keymaps-force-release/dell-touchpad \
  	keymaps-force-release/dell-xps \
+@@ -2981,7 +2981,7 @@
+ 		-e 's, at includedir\@,$(includedir),g' \
+ 		-e 's, at VERSION\@,$(VERSION),g' \
+ 		-e 's, at rootprefix\@,$(rootprefix),g' \
+-		-e 's, at udevlibexecdir\@,$(libexecdir)/udev,g' \
++		-e 's, at udevlibexecdir\@,$(udevlibexecdir),g' \
+ 		< $< > $@ || rm $@
+ 
+ units/%: units/%.in Makefile
+--- systemd-183/src/udev/keymap/keyboard-force-release.sh~	2012-04-10 22:32:29.934866904 +0200
++++ systemd-183/src/udev/keymap/keyboard-force-release.sh	2012-05-29 12:52:33.283726546 +0200
+@@ -6,7 +6,7 @@
+ 
+ case "$2" in
+         /*) scf="$2" ;;
+-        *)  scf="@pkglibexecdir@/keymaps/force-release/$2" ;;
++        *)  scf="@udevlibexecdir@/keymaps/force-release/$2" ;;
+ esac
+ 
+ read attr <"/sys/$1/force_release"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/systemd/udevlibexecdir.patch?r1=1.1&r2=1.2