[tango] 08/08: fix doc

[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 5f4296373d8107a1330af1c96cc8ac93241ec258
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Mon Feb 29 00:32:02 2016 +0100

    fix doc
---
 debian/control                                      |  4 ++++
 .../patches/0001-debian-fix_database_scripts.patch  |  2 +-
 debian/patches/0003-fix-doc.patch                   | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 debian/rules                                        | 15 +++++++--------
 5 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 603c9ad..d479ffd 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,13 @@ Build-Depends: debhelper (>= 9.20151219~),
                omniidl,
                po-debconf,
 Build-Depends-Indep: doxygen,
+                     ghostscript,
                      lyx,
                      texlive-font-utils,
+                     texlive-fonts-recommended,
                      texlive-latex-base,
+                     texlive-latex-extra,
+                     texlive-latex-recommended,
                      transfig,
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/tango.git
diff --git a/debian/patches/0001-debian-fix_database_scripts.patch b/debian/patches/0001-debian-fix_database_scripts.patch
index ab98dab..2d3ad97 100644
--- a/debian/patches/0001-debian-fix_database_scripts.patch
+++ b/debian/patches/0001-debian-fix_database_scripts.patch
@@ -14,7 +14,7 @@ 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 a2b94b5..9006dd5 100644
+index b4a5916..3d815b3 100644
 --- a/cppserver/database/create_db.sql.in
 +++ b/cppserver/database/create_db.sql.in
 @@ -1,18 +1,14 @@
diff --git a/debian/patches/0003-fix-doc.patch b/debian/patches/0003-fix-doc.patch
new file mode 100644
index 0000000..113eccd
--- /dev/null
+++ b/debian/patches/0003-fix-doc.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Mon, 29 Feb 2016 00:31:24 +0100
+Subject: fix doc
+
+---
+ doc/src/Makefile.am | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/doc/src/Makefile.am b/doc/src/Makefile.am
+index d34f2ac..1bf43c1 100644
+--- a/doc/src/Makefile.am
++++ b/doc/src/Makefile.am
+@@ -4,6 +4,5 @@ if TANGO_DOC_ENABLED
+ pdf-local: tango.pdf
+ endif
+ 
+-tango.pdf: $(srcdir)/tango.lyx
+-	cd $(srcdir); @LYX@ --export pdf2 tango.lyx
+-	mv $(srcdir)/tango.pdf .
++.lyx.pdf:
++        - at LYX@ --export-to pdf2 $@ $<
diff --git a/debian/patches/series b/debian/patches/series
index 40d07e3..ef298b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-debian-fix_database_scripts.patch
 0002-debian-my.cnf.in.patch
+0003-fix-doc.patch
diff --git a/debian/rules b/debian/rules
index ab7254c..0637f0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@ export DH_VERBOSE=1
 
 PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 VERSION := $(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
 
@@ -33,7 +32,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build-indep:
 	$(MAKE) -C lib/cpp/log4tango/doc
-	$(MAKE) -C pdf
+	$(MAKE) -C doc pdf
 
 override_dh_auto_install:
 	dh_auto_install --destdir="$(CURDIR)/debian/tmp/"
@@ -105,12 +104,12 @@ override_dh_install:
 	dh_install --list-missing -X.la
 
 override_dh_strip:
-	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 -plibtango9 --ddeb-migration='libtango9-dbg (<< 9.2.0~a+dfsg-1~)' || dh_strip
+	dh_strip -pliblog4tango5v5 --ddeb-migration='liblog4tango5v5-dbg (<< 9.2.0~a+dfsg-1~)' || dh_strip
+	dh_strip -ptango-db --ddeb-migration='tango-db-dbg (<< 9.2.0~a+dfsg-1~)' || dh_strip
+	dh_strip -ptango-starter --ddeb-migration='tango-starter-dbg (<< 9.2.0~a+dfsg-1~)' || dh_strip
+	dh_strip -ptango-accesscontrol --ddeb-migration='tango-accesscontrol-dbg (<< 9.2.0~a+dfsg-1~)' || dh_strip
+	dh_strip -ptango-test --ddeb-migration='tango-test-dbg (<< 9.2.0~a+dfsg-1~)' || dh_strip
 	dh_strip -a -Nlibtango9 -Nliblog4tango5v5 -Ntango-db -Ntango-starter -Ntango-accesscontrol -Ntango-test
 
 override_dh_installinit:

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