[SCM] TANGO distributed control system. branch, master, updated. debian/6.1.1c-1-112-g7d9a9b7

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 12a53682d20f3429bb48df6eba83acd22b2fa3e4
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Mon Dec 13 13:46:55 2010 +0100

    * remove the starter patch
    
     it was a bad fix, we will work with the upstream on this problem
     for the next release

diff --git a/debian/patches/debian/starter b/debian/patches/debian/starter
deleted file mode 100644
index f8fedbe..0000000
--- a/debian/patches/debian/starter
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: fix some path to find tango devices and the notify_daemon script
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- tango (7.1.1~dfsg-1) unstable; urgency=low
- .
-   * remove the "." from the DsStarterPath
-   * use the right notifd2db path
- .
- The person named in the Author field signed this changelog entry.
-Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- tango-7.1.1~dfsg.orig/cppserver/starter/Starter.cpp
-+++ tango-7.1.1~dfsg/cppserver/starter/Starter.cpp
-@@ -629,9 +629,7 @@ void Starter::get_device_property()
- 	//-------------------------------------------------------------
- 	if (dev_prop[0].is_empty())
- 		cout << "WARNING : startDsPath NOT defined !!!!" << endl;
--	if (startDsPath.size()==0)
--		startDsPath.push_back(".");
--	else
-+	if (startDsPath.size()!=0)
- 	for (unsigned int i=0 ; i<startDsPath.size() ; i++)
- 		INFO_STREAM << "startDsPath[" << i << "] = " << startDsPath[i] << endl;
- 	INFO_STREAM << "WaitForDriverStartup = " << waitForDriverStartup << " seconds" << endl;
---- tango-7.1.1~dfsg.orig/cppserver/starter/Starter.h
-+++ tango-7.1.1~dfsg/cppserver/starter/Starter.h
-@@ -157,7 +157,7 @@
-  //-----------------------------------------------
- #define PING_TIMEOUT			3	//	seconds
- #define	TIME_BETWEEN_STARTUPS	500	//	Milli seconds
--#define NOTIFY_DAEMON_SCRIPT	"notify_daemon"
-+#define NOTIFY_DAEMON_SCRIPT	"/usr/lib/tango/notify_daemon"
- 
- //	Used onlyduring the Cpp Api bug fixing on 
- //	specAtt->get_max_x() method.
diff --git a/debian/patches/series b/debian/patches/series
index 9d5676e..7e324ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 debian/fix_database_scripts.diff -p1
 debian/my.cnf.in.diff -p1
-debian/starter -p1
 debian/notify_daemon -p1

-- 
TANGO distributed control system.