[tango] 06/08: wip
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Mon Feb 29 08:05:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository tango.
commit 902bf195c18c4e4e6de8456b3fac74fea93a2939
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sun Feb 28 15:25:32 2016 +0100
wip
---
debian/changelog | 22 +++-
debian/control | 127 +++------------------
...tango5-dev.install => liblog4tango-dev.install} | 0
debian/liblog4tango5-doc.install | 1 +
debian/liblog4tango5-doc.manpages | 1 -
...{libtango9-dev.install => libtango-dev.install} | 0
debian/libtango9-doc.install | 2 +-
debian/mysql/9.1.0 | 4 -
debian/rules | 64 ++++++-----
debian/todo | 17 +--
10 files changed, 76 insertions(+), 162 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 00b6e88..82ab996 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,24 @@
tango (9.2.0~a+dfsg-1~exp1) experimental; urgency=medium
* Imported Upstream version 9.2.0~a+dfsg
- * Bump Standards-Version to 3.9.6 (nothing to do)
+ * Bump Standards-Version to 3.9.7 (nothing to do)
* debian/control
- - update Vcs-Git
- - add new binary packages:
- + libtango9, libtango9-dev, libtango9-dbg
+ - Update Vcs-Git
+ - Add new binary packages:
+ + liblog4tango-dev, libtango9, libtango-dev
- remove binary packages:
- + libtango8v5, libtango8-dev, libtango8v5-dbg
- - BuildDep: added lyx, omniidl and transfig
+ + liblog4tango5-dev, liblog4tango5-dbg,
+ libtango8v5, libtango8-dev, libtango8v5-dbg,
+ tango-db-dbg, tango-accesscontrol-dbg,
+ tango-starter-dbg, tango-test-dbg
+ - BuildDepends:
+ + debhelper (>= 9.20151219~) to generate the -dbgsym packages.
+ + libzmq3-dev -> libzmq5-dev | libzmq3-dev to support backports.
+ - BuildDepIndep: added lyx, omniidl and transfig, texlive-font-utils,
+ texlive-latex-base in order to build the documentation
+ - Remove all the Pre-Depends: ${misc:Pre-Depends} lines which are useless.
+ - Support for the new dbconfig-common 2.x
+ dbconfig-common -> dbconfig-mysql | dbconfig-no-thanks,
* debian/copyright
- updated for tango9
- repack using Files-Excluded
diff --git a/debian/control b/debian/control
index d1767d3..603c9ad 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,18 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
Section: science
Priority: extra
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20151219~),
dh-autoreconf,
- doxygen,
libcos4-dev,
libmysqlclient-dev,
- libzmq3-dev (>= 3.2.2),
- lyx,
+ libzmq5-dev | libzmq3-dev,
omniidl,
po-debconf,
- transfig
+Build-Depends-Indep: doxygen,
+ lyx,
+ texlive-font-utils,
+ texlive-latex-base,
+ transfig,
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/tango.git
Vcs-Git: git://anonscm.debian.org/debian-science/packages/tango.git
@@ -24,7 +26,6 @@ Multi-Arch: same
Section: libs
Depends: ${misc:Depends},
${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
Conflicts: liblog4tango5
Replaces: liblog4tango5
Description: logging for TANGO - shared library
@@ -36,14 +37,13 @@ Description: logging for TANGO - shared library
This package contains the files necessary for running applications that
use the log4tango5 library.
-Package: liblog4tango5-dev
+Package: liblog4tango-dev
Architecture: any
Multi-Arch: same
Section: libdevel
Depends: ${misc:Depends},
liblog4tango5v5 (= ${binary:Version})
-Pre-Depends: ${misc:Pre-Depends}
-Conflicts: liblog4tango4-dev
+Conflicts: liblog4tango4-dev, liblog4tango5-dev
Description: logging for TANGO - development library
Log for TANGO is a library of C++ classes for flexible logging to files,
syslog and other destinations. It is modeled after the Log for
@@ -52,21 +52,6 @@ Description: logging for TANGO - development library
.
This package contains the log4tango5 development files.
-Package: liblog4tango5v5-dbg
-Architecture: any
-Multi-Arch: same
-Section: debug
-Depends: ${misc:Depends},
- liblog4tango5v5 (= ${binary:Version})
-Pre-Depends: ${misc:Pre-Depends}
-Description: logging for TANGO - debug library
- Log for TANGO is a library of C++ classes for flexible logging to files,
- syslog and other destinations. It is modeled after the Log for
- C++ library (http://jakarta.apache.org/log4j/), staying as close to
- their API as is reasonable.
- .
- This package contains the debugging symbol for liblog4tango5v5.
-
Package: liblog4tango5-doc
Architecture: all
Section: doc
@@ -87,9 +72,6 @@ Section: libs
Depends: ${misc:Depends},
${shlibs:Depends},
tango-common
-Pre-Depends: ${misc:Pre-Depends}
-Conflicts: libtango8
-Replaces: libtango8
Description: TANGO distributed control system - shared library
TANGO is an object-oriented distributed control system using CORBA. In
TANGO all objects are representations of devices, which can be on the
@@ -107,17 +89,16 @@ Description: TANGO distributed control system - shared library
.
This package contains the files necessary for running TANGO applications.
-Package: libtango9-dev
+Package: libtango-dev
Architecture: any
Multi-Arch: same
Section: libdevel
Depends: ${misc:Depends},
libcos4-dev,
- liblog4tango5-dev,
+ liblog4tango-dev,
libtango9 (= ${binary:Version}),
- libzmq3-dev
-Pre-Depends: ${misc:Pre-Depends}
-Conflicts: libtango7-dev
+ libzmq5-dev | libzmq3-dev,
+Conflicts: libtango7-dev, libtango8-dev
Description: TANGO distributed control system - development library
TANGO is an object-oriented distributed control system using CORBA. In
TANGO all objects are representations of devices, which can be on the
@@ -135,30 +116,6 @@ Description: TANGO distributed control system - development library
.
This package contains the tango9 development files.
-Package: libtango9-dbg
-Architecture: any
-Multi-Arch: same
-Section: debug
-Depends: ${misc:Depends},
- libtango9 (= ${binary:Version})
-Pre-Depends: ${misc:Pre-Depends}
-Description: TANGO distributed control system - debug library
- TANGO is an object-oriented distributed control system using CORBA. In
- TANGO all objects are representations of devices, which can be on the
- same computer or distributed over a network. Communication between
- devices uses CORBA and can be synchronous, asynchronous or event driven.
- .
- The object model in TANGO supports methods, attributes and properties.
- TANGO provides an API which hides all the details of network access and
- provides object browsing, discovery, and security features. Permanent
- data is stored in a MySQL database.
- .
- TANGO is being actively developed as a collaborative effort between the
- ESRF (www.esrf.eu), Soleil (synchrotron-soleil.fr), Alba (www.cells.es),
- and Elettra institutes (www.elettra.trieste.it).
- .
- This package contains the debugging symbols for tango9.
-
Package: libtango9-doc
Architecture: all
Section: doc
@@ -206,7 +163,7 @@ Architecture: any
Section: net
Depends: ${misc:Depends},
${shlibs:Depends},
- dbconfig-common,
+ dbconfig-mysql | dbconfig-no-thanks,
libtango-tools,
lsb-base
Recommends: mysql-client
@@ -219,20 +176,6 @@ Description: TANGO distributed control system - database server
.
This package provides a TANGO database server using MySQL.
-Package: tango-db-dbg
-Architecture: any
-Section: debug
-Depends: ${misc:Depends},
- tango-db (= ${binary:Version})
-Description: TANGO distributed control system - database debug
- TANGO is an object oriented distributed control system. It allows
- communication between TANGO device processes running on the same
- computer or distributed over the network. These processes can
- provide services to the control system all over the network, such as
- hardware control or data processing.
- .
- This package contains the debugging symbols for tango-db.
-
Package: tango-starter
Architecture: any
Section: net
@@ -251,20 +194,6 @@ Description: TANGO distributed control system - starter server
This package provides a TANGO device control server. It can start, stop,
or report the status of other TANGO components.
-Package: tango-starter-dbg
-Architecture: any
-Section: debug
-Depends: ${misc:Depends},
- tango-starter (= ${binary:Version})
-Description: TANGO distributed control system - starter debug
- TANGO is an object oriented distributed control system. It allows
- communication between TANGO device processes running on the same
- computer or distributed over the network. These processes can
- provide services to the control system all over the network, such as
- hardware control or data processing.
- .
- This package contains the debugging symbols for tango-starter.
-
Package: tango-accesscontrol
Architecture: any
Section: net
@@ -285,20 +214,6 @@ Description: TANGO distributed control system - accesscontrol server
manage the users and IP addresses that are permitted to access TANGO
devices.
-Package: tango-accesscontrol-dbg
-Architecture: any
-Section: debug
-Depends: ${misc:Depends},
- tango-accesscontrol (= ${binary:Version})
-Description: TANGO distributed control system - accesscontrol debug
- TANGO is an object oriented distributed control system. It allows
- communication between TANGO device processes running on the same
- computer or distributed over the network. These processes can
- provide services to the control system all over the network, such as
- hardware control or data processing.
- .
- This package contains the debugging symbols for tango-accesscontrol.
-
Package: tango-test
Architecture: any
Section: net
@@ -314,17 +229,3 @@ Description: TANGO distributed control system - test device
.
This package provides a TANGO device which implements all TANGO
attribute types, and can be used for testing the installation.
-
-Package: tango-test-dbg
-Architecture: any
-Section: debug
-Depends: ${misc:Depends},
- tango-test (= ${binary:Version})
-Description: TANGO distributed control system - test debug
- TANGO is an object oriented distributed control system. It allows
- communication between TANGO device processes running on the same
- computer or distributed over the network. These processes can
- provide services to the control system all over the network, such as
- hardware control or data processing.
- .
- This package contains the debugging symbols for tango-test.
diff --git a/debian/liblog4tango5-dev.install b/debian/liblog4tango-dev.install
similarity index 100%
rename from debian/liblog4tango5-dev.install
rename to debian/liblog4tango-dev.install
diff --git a/debian/liblog4tango5-doc.install b/debian/liblog4tango5-doc.install
index d002aff..d7d6302 100644
--- a/debian/liblog4tango5-doc.install
+++ b/debian/liblog4tango5-doc.install
@@ -1 +1,2 @@
usr/share/doc/log4tango/log4tango-*/api usr/share/doc/liblog4tango5-doc/html
+usr/share/man/man3
\ No newline at end of file
diff --git a/debian/liblog4tango5-doc.manpages b/debian/liblog4tango5-doc.manpages
deleted file mode 100644
index 1186966..0000000
--- a/debian/liblog4tango5-doc.manpages
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/man/man3/*
diff --git a/debian/libtango9-dev.install b/debian/libtango-dev.install
similarity index 100%
rename from debian/libtango9-dev.install
rename to debian/libtango-dev.install
diff --git a/debian/libtango9-doc.install b/debian/libtango9-doc.install
index cf497dd..f757b38 100644
--- a/debian/libtango9-doc.install
+++ b/debian/libtango9-doc.install
@@ -1,2 +1,2 @@
usr/share/doc/tango/tango.pdf usr/share/doc/libtango9-doc
-usr/share/idl usr/share/doc/libtango9-doc
\ No newline at end of file
+usr/share/tango/idl usr/share/doc/libtango9-doc
\ No newline at end of file
diff --git a/debian/mysql/9.1.0 b/debian/mysql/9.1.0
index f9b25b3..736b52f 100644
--- a/debian/mysql/9.1.0
+++ b/debian/mysql/9.1.0
@@ -6,10 +6,8 @@ USE tango;
UPDATE class_attribute_history_id SET id=0;
UPDATE class_history_id SET id=0;
-UPDATE class_pipe_history_id SET id=0;
UPDATE device_attribute_history_id SET id=0;
UPDATE device_history_id SET id=0;
-UPDATE device_pipe_history_id SET id=0;
UPDATE object_history_id SET id=0;
#
@@ -21,8 +19,6 @@ DELETE FROM property_attribute_device_hist;
DELETE FROM property_class_hist;
DELETE FROM property_device_hist;
DELETE FROM property_hist;
-DELETE FROM property_pipe_class_hist;
-DELETE FROM property_pipe_device_hist;
#
# Table structure for table 'property_pipe_class'
diff --git a/debian/rules b/debian/rules
index 5e57bcb..ef5cff0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,53 +1,71 @@
#!/usr/bin/make -f
-BUILDROOT=build
+export DH_VERBOSE=1
+
PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+.*/\1/p')
-FULLDEBVERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*-.*\)/\1/p')
+LAST_DBG_VERSION := "9.2.0~a+dfsg-1~"
-CONFIGURE_OPTS := --with-omni=/usr --disable-static --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx --with-lyx --with-fig2dev
+CONFIGURE_OPTS := --with-omni=/usr --disable-static --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx
export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
+# 816173
+export LYX_USERDIR_21x=$(CURDIR)/
+
+%:
+ dh $@ --with autoreconf
+
sql:
./configure $(CONFIGURE_OPTS)
# use this target to generate the dbconfig-common upgrade script once the debian/changelog is ok
cat cppserver/database/stored_proc.sql\
- cppserver/database/update_db.sql > debian/mysql/$(FULLDEBVERSION)
+ cppserver/database/update_db.sql > debian/mysql/$(VERSION)
$(MAKE) distclean
+# 816173
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf $(CURDIR)/.lyx
+
override_dh_auto_configure:
dh_auto_configure -- $(CONFIGURE_OPTS)
-override_dh_auto_build:
- dh_auto_build
- # build the documentation
- cd doc && $(MAKE) pdf
+override_dh_auto_build-indep:
+ $(MAKE) -C lib/cpp/log4tango/doc
+ $(MAKE) -C pdf
override_dh_auto_install:
dh_auto_install --destdir="$(CURDIR)/debian/tmp/"
# 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 -p -m 644 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/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
- install -p -m 644 $(CURDIR)/$(BUILDROOT)/cppserver/database/create_db_tables.sql debian/tmp/usr/share/tango-db/create_db_tables.sql
- install -p -m 644 $(CURDIR)/$(BUILDROOT)/cppserver/database/stored_proc.sql debian/tmp/usr/share/tango-db/stored_proc.sql
- install -p -m 600 $(CURDIR)/$(BUILDROOT)/cppserver/database/my.cnf debian/tmp/usr/share/tango-db/my.cnf
+ install -p -m 644 cppserver/database/create_db_tables.sql debian/tmp/usr/share/tango-db/create_db_tables.sql
+ install -p -m 644 cppserver/database/stored_proc.sql debian/tmp/usr/share/tango-db/stored_proc.sql
+ install -p -m 600 cppserver/database/my.cnf debian/tmp/usr/share/tango-db/my.cnf
# install the tango home dir
install -d debian/tmp/var/lib/tango
+override_dh_auto_install-indep:
+ $(MAKE) -C lib/cpp/log4tango/doc install
+ $(MAKE) -C doc install
+
+override_dh_install:
+ dh_install --list-missing -X.la
+
override_dh_strip:
- dh_strip -plibtango9 --dbg-package=libtango9-dbg
- dh_strip -pliblog4tango5v5 --dbg-package=liblog4tango5v5-dbg
- dh_strip -ptango-db --dbg-package=tango-db-dbg
- dh_strip -ptango-starter --dbg-package=tango-starter-dbg
- dh_strip -ptango-accesscontrol --dbg-package=tango-accesscontrol-dbg
- dh_strip -ptango-test --dbg-package=tango-test-dbg
+ dh_strip -plibtango9 --ddeb-migration='libtango9-dbg (<< ${LAST_DBG_VERSION}~)' || dh_strip
+ dh_strip -pliblog4tango5v5 --ddeb-migration='liblog4tango5v5-dbg (<< ${LAST_DBG_VERSION}~)' || dh_strip
+ dh_strip -ptango-db --ddeb-migration='tango-db-dbg (<< ${LAST_DBG_VERSION}~)' || dh_strip
+ dh_strip -ptango-starter --ddeb-migration='tango-starter-dbg (<< ${LAST_DBG_VERSION}~)' || dh_strip
+ dh_strip -ptango-accesscontrol --ddeb-migration='tango-accesscontrol-dbg (<< ${LAST_DBG_VERSION}~)' || dh_strip
+ dh_strip -ptango-test --ddeb-migration='tango-test-dbg (<< ${LAST_DBG_VERSION}~)' || dh_strip
dh_strip -a -Nlibtango9 -Nliblog4tango5v5 -Ntango-db -Ntango-starter -Ntango-accesscontrol -Ntango-test
override_dh_installinit:
@@ -57,11 +75,5 @@ override_dh_installinit:
dh_installinit -ptango-starter --update-rcd-params="defaults 30"
dh_installinit -a -Ntango-accesscontrol -Ntango-starter
-override_dh_install:
- dh_install --list-missing -X.la
-
-%:
- dh $@ --builddirectory=$(BUILDROOT) --with autoreconf
-
-.PHONY: get-orig-source
-
+# Aucun test nécessaire pour la documentation
+override_dh_auto_test-indep:
diff --git a/debian/todo b/debian/todo
index 2697bd9..44f5852 100644
--- a/debian/todo
+++ b/debian/todo
@@ -1,7 +1,11 @@
* TODO 9.2.0 release
+** fix the TANGO_HOST parsing
+ Instead of parsing directly the /etc/tangorc file, source it and
+ parse the TANGO_HOST environment variable.
** what about the configure check for zeromq but require zmq.hpp ?
-
** upgrade script of tango-db
+ - [X] for now the script were hand generated and fixed while
+ testing the package installation.
- [ ] Maybe the best solution is to install all the official script at
the official place (need to change the Makfile.am in order to
install the script even if the database is not created)
@@ -9,17 +13,7 @@
upstream in order to simplify the pacakging. This scrip should
not use source or if it use source all the script must be kept
fromone version to the other. (discuss of this with taurel).
-
-** -dbg
- remove the liblog4tango5-dbg, libtango9-dbg files and migrate the
- other -dbg packages. using the override.
- >> override_dh_strip:
- >> dh_strip --ddeb-migration="-dbg (<< 9.1.0+dfsg1-1)" || dh_strip
-
-** migrate to the new dbconfig-common
-
** doxygen -u pour upgrader le fichier de configuration voir quelles version minimum de doxygen doit être supporté.
-
** il y a des warning avec gcc4.7 et log4tango
In file included from ../../../../../lib/cpp/log4tango/src/StringUtil.cpp:47:0:
../../../../../lib/cpp/log4tango/src/snprintf.c: In function 'int portable_vsnprintf(char*, size_t, const char*, va_list)':
@@ -39,3 +33,4 @@
/home/picca/Debian/main/tango/tango/lib/cpp/log4tango/include/log4tango/LoggerStream.hh:112: warning: argument 'endoflog' of command @param is not found in the argument list of log4tango::LoggerStream::operator<<(LOG4TANGO_UNUSED(ls_terminator endoflog))
** systemd integration
+ TODO
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git
More information about the debian-science-commits
mailing list