[maemo-commits] [maemo-commits] r18384 - in projects/haf/trunk/osso-af-utils: . debian scripts

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-05-15 13:39:55 +0300 (Fri, 15 May 2009)
New Revision: 18384

Added:
   projects/haf/trunk/osso-af-utils/scripts/
   projects/haf/trunk/osso-af-utils/scripts/41tmp-reaper
Removed:
   projects/haf/trunk/osso-af-utils/debian/tmp-reaper.xsession
Modified:
   projects/haf/trunk/osso-af-utils/Makefile.am
   projects/haf/trunk/osso-af-utils/Makefile.in
   projects/haf/trunk/osso-af-utils/configure
   projects/haf/trunk/osso-af-utils/configure.in
   projects/haf/trunk/osso-af-utils/debian/rules
Log:
Avoid using dh_installxsession

Modified: projects/haf/trunk/osso-af-utils/Makefile.am
===================================================================
--- projects/haf/trunk/osso-af-utils/Makefile.am	2009-05-15 10:19:52 UTC (rev 18383)
+++ projects/haf/trunk/osso-af-utils/Makefile.am	2009-05-15 10:39:55 UTC (rev 18384)
@@ -1,2 +1,2 @@
-SUBDIRS = src
+SUBDIRS = src scripts
 

Modified: projects/haf/trunk/osso-af-utils/Makefile.in
===================================================================
--- projects/haf/trunk/osso-af-utils/Makefile.in	2009-05-15 10:19:52 UTC (rev 18383)
+++ projects/haf/trunk/osso-af-utils/Makefile.in	2009-05-15 10:39:55 UTC (rev 18384)
@@ -141,7 +141,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = src
+SUBDIRS = src scripts
 all: all-recursive
 
 .SUFFIXES:

Modified: projects/haf/trunk/osso-af-utils/configure
===================================================================
--- projects/haf/trunk/osso-af-utils/configure	2009-05-15 10:19:52 UTC (rev 18383)
+++ projects/haf/trunk/osso-af-utils/configure	2009-05-15 10:39:55 UTC (rev 18384)
@@ -3211,7 +3211,7 @@
 fi
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -3807,6 +3807,7 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

Modified: projects/haf/trunk/osso-af-utils/configure.in
===================================================================
--- projects/haf/trunk/osso-af-utils/configure.in	2009-05-15 10:19:52 UTC (rev 18383)
+++ projects/haf/trunk/osso-af-utils/configure.in	2009-05-15 10:39:55 UTC (rev 18384)
@@ -1,5 +1,5 @@
 AC_INIT(src/waitdbus.c)
 AM_INIT_AUTOMAKE(waitdbus, 1.0)
 AC_PROG_CC
-AC_OUTPUT(Makefile src/Makefile)
+AC_OUTPUT(Makefile src/Makefile scripts/Makefile)
 

Modified: projects/haf/trunk/osso-af-utils/debian/rules
===================================================================
--- projects/haf/trunk/osso-af-utils/debian/rules	2009-05-15 10:19:52 UTC (rev 18383)
+++ projects/haf/trunk/osso-af-utils/debian/rules	2009-05-15 10:39:55 UTC (rev 18384)
@@ -81,7 +81,6 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	dh_installxsession --name=tmp-reaper -u 'post 41'
 
 	# Add here commands to install the package into debian/osso-af-utils.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/osso-af-utils

Deleted: projects/haf/trunk/osso-af-utils/debian/tmp-reaper.xsession
===================================================================
--- projects/haf/trunk/osso-af-utils/debian/tmp-reaper.xsession	2009-05-15 10:19:52 UTC (rev 18383)
+++ projects/haf/trunk/osso-af-utils/debian/tmp-reaper.xsession	2009-05-15 10:39:55 UTC (rev 18384)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/sbin/temp-reaper &

Copied: projects/haf/trunk/osso-af-utils/scripts/41tmp-reaper (from rev 18382, projects/haf/trunk/osso-af-utils/debian/tmp-reaper.xsession)


Property changes on: projects/haf/trunk/osso-af-utils/scripts/41tmp-reaper
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mergeinfo
   +