[tango] 06/21: refresh all the remaining patches

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository tango.

commit 67b2f6c40caf464df08ec16405486b52792d2f1d
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Oct 8 15:16:45 2015 +0200

    refresh all the remaining patches
    
    Conflicts:
    	debian/patches/series
---
 debian/changelog                                   |  4 +++
 .../patches/0001-debian-fix_database_scripts.patch |  8 ++---
 debian/patches/0003-debian-notify_daemon.patch     | 37 ----------------------
 ...-forwarded-upstrean-fix-FTBFS-on-sparc64.patch} |  8 ++---
 debian/patches/series                              |  3 +-
 5 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce40084..9b27c0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,10 @@ tango (9.1.0~rc1+dfsg-1) UNRELEASED; urgency=medium
       - 0006-fix-upstream-p812_2.patch
       - 0007-fix-upstream-p812_3.patch
       - 0008-fix-upsteam-p812_4.patch
+    - refreshed
+      - 0001-debian-fix_database_scripts.patch
+      - 0002-debian-my.cnf.in.patch
+      - 0005->0003-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Thu, 02 Jul 2015 10:48:59 +0200
 
diff --git a/debian/patches/0001-debian-fix_database_scripts.patch b/debian/patches/0001-debian-fix_database_scripts.patch
index 76e4a90..ab98dab 100644
--- a/debian/patches/0001-debian-fix_database_scripts.patch
+++ b/debian/patches/0001-debian-fix_database_scripts.patch
@@ -14,10 +14,10 @@ Signed-off-by: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
  1 file changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/cppserver/database/create_db.sql.in b/cppserver/database/create_db.sql.in
-index 210a335..292d005 100644
+index a2b94b5..9006dd5 100644
 --- a/cppserver/database/create_db.sql.in
 +++ b/cppserver/database/create_db.sql.in
-@@ -1,12 +1,8 @@
+@@ -1,18 +1,14 @@
 -
 -CREATE DATABASE @TANGO_DB_NAME@;
 -USE @TANGO_DB_NAME@;
@@ -30,11 +30,11 @@ index 210a335..292d005 100644
 +source /usr/share/tango-db/create_db_tables.sql
  
  #
- # Init the history identifiers
-@@ -126,5 +122,5 @@ INSERT INTO property_class VALUES ('TangoAccessControl','AllowedAccessCmd',6,'Ge
  # Load the stored procedures
  #
  
 -source stored_proc.sql
 +source /usr/share/tango-db/stored_proc.sql
  
+ #
+ # Init the history identifiers
diff --git a/debian/patches/0003-debian-notify_daemon.patch b/debian/patches/0003-debian-notify_daemon.patch
deleted file mode 100644
index ceabce9..0000000
--- a/debian/patches/0003-debian-notify_daemon.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 file 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/0005-forwarded-upstrean-fix-FTBFS-on-sparc64.patch b/debian/patches/0003-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
similarity index 85%
rename from debian/patches/0005-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
rename to debian/patches/0003-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
index 4ac95b8..c1fb134 100644
--- a/debian/patches/0005-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
+++ b/debian/patches/0003-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
@@ -8,10 +8,10 @@ Subject: forwarded upstrean fix FTBFS on sparc64
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cppserver/database/Makefile.am b/cppserver/database/Makefile.am
-index 9cf6324..f5e33eb 100644
+index a0077ff..04701e5 100644
 --- a/cppserver/database/Makefile.am
 +++ b/cppserver/database/Makefile.am
-@@ -6,7 +6,7 @@ INCLUDES = $(ORB_INCLUDE_PREFIX)  $(LIBZMQ_CFLAGS) \
+@@ -6,7 +6,7 @@ AM_CPPFLAGS = $(ORB_INCLUDE_PREFIX)  $(LIBZMQ_CFLAGS) \
        	$(MYSQLCLIENT_CFLAGS) \
        	$(ZLIB_CPPFLAGS)
  
@@ -21,10 +21,10 @@ index 9cf6324..f5e33eb 100644
  LDADD = -L$(top_builddir)/lib/cpp/server -ltango -L$(top_builddir)/lib/cpp/log4tango/src \
  		-llog4tango $(MYSQLCLIENT_LDFLAGS) \
 diff --git a/cppserver/database/Makefile.in b/cppserver/database/Makefile.in
-index b1dc264..54c7597 100644
+index 18f59c1..8f5cfd9 100644
 --- a/cppserver/database/Makefile.in
 +++ b/cppserver/database/Makefile.in
-@@ -327,7 +327,7 @@ INCLUDES = $(ORB_INCLUDE_PREFIX)  $(LIBZMQ_CFLAGS) \
+@@ -425,7 +425,7 @@ AM_CPPFLAGS = $(ORB_INCLUDE_PREFIX)  $(LIBZMQ_CFLAGS) \
        	$(MYSQLCLIENT_CFLAGS) \
        	$(ZLIB_CPPFLAGS)
  
diff --git a/debian/patches/series b/debian/patches/series
index 6d5412d..9777af5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-debian-fix_database_scripts.patch
 0002-debian-my.cnf.in.patch
-0003-debian-notify_daemon.patch
-0005-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
+0003-forwarded-upstrean-fix-FTBFS-on-sparc64.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git