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

Frédéric-Emmanuel PICCA picca at synchrotron-soleil.fr
Thu Mar 24 15:54:48 UTC 2011 

The following commit has been merged in the master branch:
commit 1511886f41859af6fd158c705e42a951f99b22d7
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Tue Mar 22 15:29:13 2011 +0100

    * switch to gbp-pq for the patch serie.

diff --git a/debian/patches/debian/fix_database_scripts.diff b/debian/patches/0001-debian-fix_database_scripts.patch
similarity index 75%
rename from debian/patches/debian/fix_database_scripts.diff
rename to debian/patches/0001-debian-fix_database_scripts.patch
index 133f03e..5b72a54 100644
--- a/debian/patches/debian/fix_database_scripts.diff
+++ b/debian/patches/0001-debian-fix_database_scripts.patch
@@ -1,16 +1,19 @@
-From: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
-Subject: [PATCH] debian/fix_database_scripts
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
+Date: Tue, 22 Mar 2011 15:25:38 +0100
+Subject: debian/fix_database_scripts
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 update the database creation script to deal with the debian path
 
 Signed-off-by: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
-
 ---
  cppserver/database/create_db.sql.in |    8 ++------
  1 files changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/cppserver/database/create_db.sql.in b/cppserver/database/create_db.sql.in
-index 4a89f7e..255c32c 100644
+index e9c4d50..e5048e4 100644
 --- a/cppserver/database/create_db.sql.in
 +++ b/cppserver/database/create_db.sql.in
 @@ -1,12 +1,8 @@
@@ -35,4 +38,3 @@ index 4a89f7e..255c32c 100644
 +source /usr/share/tango-db/stored_proc.sql
  
 -- 
-tg: (f79114c..) debian/fix_database_scripts (depends on: master)
diff --git a/debian/patches/debian/my.cnf.in.diff b/debian/patches/0002-debian-my.cnf.in.patch
similarity index 81%
rename from debian/patches/debian/my.cnf.in.diff
rename to debian/patches/0002-debian-my.cnf.in.patch
index 948f028..ee19861 100644
--- a/debian/patches/debian/my.cnf.in.diff
+++ b/debian/patches/0002-debian-my.cnf.in.patch
@@ -1,10 +1,13 @@
-From: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
-Subject: [PATCH] debian/my.cnf.in
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
+Date: Tue, 22 Mar 2011 15:25:38 +0100
+Subject: debian/my.cnf.in
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 set the right parameters for the mysql configuration file
 
 Signed-off-by: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
-
 ---
  cppserver/database/my.cnf.in |    9 ++++-----
  1 files changed, 4 insertions(+), 5 deletions(-)
@@ -38,4 +41,3 @@ index 69f574c..8bae2c7 100644
  # back_log is the number of connections the operating system can keep in
  # the listen queue, before the MySQL connection manager thread has
 -- 
-tg: (f2813b3..) debian/my.cnf.in (depends on: master)
diff --git a/debian/patches/0003-debian-notify_daemon.patch b/debian/patches/0003-debian-notify_daemon.patch
new file mode 100644
index 0000000..5cc12bc
--- /dev/null
+++ b/debian/patches/0003-debian-notify_daemon.patch
@@ -0,0 +1,37 @@
+From: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Date: Tue, 22 Mar 2011 15:25:38 +0100
+Subject: debian/notify_daemon
+
+---
+ scripts/notify_daemon.in |    6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/scripts/notify_daemon.in b/scripts/notify_daemon.in
+index a610b75..3c8ca1d 100755
+--- a/scripts/notify_daemon.in
++++ b/scripts/notify_daemon.in
+@@ -16,8 +16,6 @@ SunOS)  KILLALL=pkill
+ esac
+ 
+ 
+-BIN_DIR=@prefix@/bin
+-
+ ulimit -s 2048
+ 
+ #------------------------------------------------------------
+@@ -35,12 +33,12 @@ fi
+ 
+ echo "TANGO_HOST=$TANGO_HOST"
+ echo "Starting notifd....."
+-$BIN_DIR/notifd -n  -DDeadFilterInterval=300  1>/dev/null 2>/tmp/notifd.err &
++notifd -n  -DDeadFilterInterval=300  1>/dev/null 2>/tmp/notifd.err &
+ 
+ 
+ #---- Sleep a bit before write IOR in database
+ sleep 3
+-$BIN_DIR/notifd2db
++/usr/lib/tango/notifd2db
+ 
+ echo "ulimit has been set to:"
+ ulimit -s
+-- 
diff --git a/debian/patches/debian/notify_daemon b/debian/patches/debian/notify_daemon
deleted file mode 100644
index c547036..0000000
--- a/debian/patches/debian/notify_daemon
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: remove the useless BIN_DIR
- 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
- .
-   * Imported Upstream version 7.1.1~dfsg
-   * add the dversionmangle in the watch file
-   * update to debian-policy 3.8.3 (nothing to do)
-   * switch to the 3.0 (quilt) source format
-   * starter install the right device in the database during installation.
- .
- 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/scripts/notify_daemon.in
-+++ tango-7.1.1~dfsg/scripts/notify_daemon.in
-@@ -16,8 +16,6 @@ SunOS)  KILLALL=pkill
- esac
- 
- 
--BIN_DIR=@prefix@/bin
--
- ulimit -s 2048
- 
- #------------------------------------------------------------
-@@ -35,12 +33,12 @@ fi
- 
- echo "TANGO_HOST=$TANGO_HOST"
- echo "Starting notifd....."
--$BIN_DIR/notifd -n  -DDeadFilterInterval=300  1>/dev/null 2>/tmp/notifd.err &
-+notifd -n  -DDeadFilterInterval=300  1>/dev/null 2>/tmp/notifd.err &
- 
- 
- #---- Sleep a bit before write IOR in database
- sleep 3
--$BIN_DIR/notifd2db
-+/usr/lib/tango/notifd2db
- 
- echo "ulimit has been set to:"
- ulimit -s
diff --git a/debian/patches/series b/debian/patches/series
index 7e324ad..31d0855 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-debian/fix_database_scripts.diff -p1
-debian/my.cnf.in.diff -p1
-debian/notify_daemon -p1
+0001-debian-fix_database_scripts.patch
+0002-debian-my.cnf.in.patch
+0003-debian-notify_daemon.patch

-- 
TANGO distributed control system.

More information about the debian-science-commits mailing list