From 7cdf0258b2fe72edced554e706b28d3a14a197b0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 26 Jun 2012 10:41:24 +0000 Subject: [PATCH] Merge branch_1_0 to HEAD, take 3. --- emi.canl.canl-c/Makefile | 4 ++-- emi.canl.canl-c/doc/src/canl-cs-auth-connection.tex | 3 +-- emi.canl.canl-c/doc/src/canl.tex | 1 + emi.canl.canl-c/project/debian.canl.doc-base | 2 +- emi.canl.canl-c/project/debian.libcanl-c-dev.dirs | 2 +- emi.canl.canl-c/project/debian.rules | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/emi.canl.canl-c/Makefile b/emi.canl.canl-c/Makefile index bf5d60c..ceaf85e 100644 --- a/emi.canl.canl-c/Makefile +++ b/emi.canl.canl-c/Makefile @@ -146,7 +146,7 @@ install: all mkdir -p ${DESTDIR}${PREFIX}${prefix}/bin mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} mkdir -p ${DESTDIR}${PREFIX}${prefix}/include - mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/canl-${module.version} + mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/canl-c-${module.version} ${INSTALL} -m 755 server ${DESTDIR}${PREFIX}${prefix}/bin/emi-canl-server ${INSTALL} -m 755 client ${DESTDIR}${PREFIX}${prefix}/bin/emi-canl-client ${INSTALL} -m 755 proxy \ @@ -157,7 +157,7 @@ install: all ${INSTALL} -m 644 ${top_srcdir}/src/canl.h \ ${top_srcdir}/src/canl_ssl.h canl_err.h \ ${DESTDIR}${PREFIX}${prefix}/include - ${INSTALL} -m 644 canl.pdf ${DESTDIR}${PREFIX}${prefix}/share/doc/canl-${module.version} + ${INSTALL} -m 644 canl.pdf ${DESTDIR}${PREFIX}${prefix}/share/doc/canl-c-${module.version} stage: all $(MAKE) install PREFIX=${stagedir} diff --git a/emi.canl.canl-c/doc/src/canl-cs-auth-connection.tex b/emi.canl.canl-c/doc/src/canl-cs-auth-connection.tex index a2f0bd2..423e6ef 100644 --- a/emi.canl.canl-c/doc/src/canl-cs-auth-connection.tex +++ b/emi.canl.canl-c/doc/src/canl-cs-auth-connection.tex @@ -144,8 +144,7 @@ char *proxy, canl_password_callback clb, void *pass)\end{verbatim} We give an example of a caNl client that use \textit{Main API} with openssl. We do not define variables in this example, unless their type is \CANL defined. For complete sample see -{\tt canl\_samples\_server.c} in -\TODO Where to find sources (package?)- Frantisek? +{\tt canl\_samples\_server.c} in source package or \href{http://glite.cvs.cern.ch/cgi-bin/glite.cgi/emi.canl.canl-c/examples/canl\_sample\_server.c?revision=HEAD}{canl\_sample\_server.c at CVS} Include nesessary header files: \begin{lstlisting} diff --git a/emi.canl.canl-c/doc/src/canl.tex b/emi.canl.canl-c/doc/src/canl.tex index 39dfd5a..323eb37 100644 --- a/emi.canl.canl-c/doc/src/canl.tex +++ b/emi.canl.canl-c/doc/src/canl.tex @@ -37,6 +37,7 @@ \usepackage{listings} \usepackage{amsmath} +\usepackage{hyperref} %\setlength{\marginparwidth}{1.2in} \let\oldmarginpar\marginpar diff --git a/emi.canl.canl-c/project/debian.canl.doc-base b/emi.canl.canl-c/project/debian.canl.doc-base index edbd295..4cc8006 100644 --- a/emi.canl.canl-c/project/debian.canl.doc-base +++ b/emi.canl.canl-c/project/debian.canl.doc-base @@ -4,4 +4,4 @@ Abstract: CaNl Developer’s Guide explains how to use the Common Authentication Section: Programming/C Format: PDF -Files: /usr/share/doc/canl/canl.pdf.gz +Files: /usr/share/doc/canl-c/canl.pdf.gz diff --git a/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs b/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs index 32562c6..8fdf2ee 100644 --- a/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs +++ b/emi.canl.canl-c/project/debian.libcanl-c-dev.dirs @@ -1,3 +1,3 @@ usr/include usr/lib -usr/share/doc/canl-doc +usr/share/doc/canl-c diff --git a/emi.canl.canl-c/project/debian.rules b/emi.canl.canl-c/project/debian.rules index 162aae5..c8abd81 100644 --- a/emi.canl.canl-c/project/debian.rules +++ b/emi.canl.canl-c/project/debian.rules @@ -39,8 +39,8 @@ install: build-stamp rm -vf $(CURDIR)/debian/tmp/usr/lib/*.la rm -vf $(CURDIR)/debian/tmp/usr/lib/*.a find $(CURDIR)/debian/tmp -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH' - mv $(CURDIR)/debian/tmp/usr/share/doc/canl-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/canl - (cd $(CURDIR)/debian/tmp/usr/share/doc/canl; \ + mv $(CURDIR)/debian/tmp/usr/share/doc/canl-c-@MAJOR@.@MINOR@.@REVISION@ $(CURDIR)/debian/tmp/usr/share/doc/canl-c + (cd $(CURDIR)/debian/tmp/usr/share/doc/canl-c; \ rm -fv ChangeLog LICENSE; \ cat $(CURDIR)/project/ChangeLog | gzip -9 > changelog.gz) -- 1.8.2.3