[SCM] tango branch, master, updated. debian/8.0.5+dfsg-1-1-g1dd4c13

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 1b93c4f4a63071c0a4efcb75566c2a6ac236cbf0
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Mon May 28 22:27:25 2012 +0200

    fix the sql target

diff --git a/debian/rules b/debian/rules
index 72f51dc..0fcfa3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,10 +18,12 @@ get-orig-source:
 	gzip -9 ../$(PACKAGE)-$(VERSION)+dfsg.tar
 	ln -fs $(PACKAGE)-$(VERSION)+dfsg.tar.gz ../$(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz
 
-sql: override_dh_auto_configure
+sql:
+	./configure --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx
 	# use this target to generate the dbconfig-common upgrade script once the debian/changelog is ok
-	cat $(CURDIR)/$(BUILDROOT)/cppserver/database/stored_proc.sql\
-	    $(CURDIR)/$(BUILDROOT)/cppserver/database/update_db.sql > debian/sql/$(FULLDEBVERSION)
+	cat cppserver/database/stored_proc.sql\
+	    cppserver/database/update_db.sql > debian/mysql/$(FULLDEBVERSION)
+	$(MAKE) distclean
 
 override_dh_auto_configure:
 	dh_auto_configure -- --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx
@@ -31,8 +33,8 @@ override_dh_auto_install:
 	# install dbconfig-common scripts
 	install -d debian/tmp/usr/share/dbconfig-common/data/tango-db/install
 	install -p -m 644 $(CURDIR)/$(BUILDROOT)/cppserver/database/create_db.sql debian/tmp/usr/share/dbconfig-common/data/tango-db/install/mysql
-	install -d debian/tmp/usr/share/dbconfig-common/data/tango-db/upgrade
-	install -p -m 644 debian/mysql debian/tmp/usr/share/dbconfig-common/data/tango-db/upgrade/
+	install -d debian/tmp/usr/share/dbconfig-common/data/tango-db/upgrade/mysql
+	install -p -m 644 debian/mysql/* debian/tmp/usr/share/dbconfig-common/data/tango-db/upgrade/mysql
 
 	# install scripts used during the configuration
 	install -d debian/tmp/usr/share/tango-db

-- 
TANGO distributed control system.