build problems fixed

ChangeLog

@@ -1,3 +1,25 @@
+2017-02-02 13:06  
+
+	* [r387] debian/docs[DEL]:
+	  fix README in both debian packages problem
+
+2017-02-02 12:02  
+
+	* [r386] COPYING, INSTALL:
+	  just a test
+
+2017-01-08 08:55  
+
+	* [r385] debian/changelog.in:
+	  rebuilt debian/changelog.in
+
+2017-01-07 14:27  
+
+	* [r384] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
+	  build-in-docker.conf, build-in-docker.sh, debian/control.in,
+	  resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh:
+	  build system updated
+
 2016-10-05 09:48  
 
 	* [r383] debian/control.in:

ax_init_standard_project.m4

@@ -167,6 +167,12 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'"
   AX_SUBST(NUMBERS)
   AX_SUBST(HOME)
+  DEB_DEPEND_IFEXISTS=
+  DEB_BUILD_DEPEND=
+  DEB_DEPEND=
+  AC_SUBST(DEB_DEPEND_IFEXISTS)
+  AC_SUBST(DEB_BUILD_DEPEND)
+  AC_SUBST(DEB_DEPEND)
   if test -f README.md; then
     README=$(tail -n +3 README.md)
     DESCRIPTION=$(head -1 README.md)
@@ -974,3 +980,30 @@ AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
   fi
   AC_SUBST(DEB_DEPEND_IFEXISTS)
 ])
+
+# require package in debian/control.in append @DEB_BUILD_DEPEND@ to Build-Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_DEB_BUILD_DEPEND], [
+  pkg=$1
+  DEB_BUILD_DEPEND+=", ${pkg}"
+  AC_SUBST(DEB_BUILD_DEPEND)
+])
+
+# require package in debian/control.in append @DEB_DEPEND@ to Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_DEB_DEPEND], [
+  pkg=$1
+  DEB_DEPEND+=", ${pkg}"
+  AC_SUBST(DEB_DEPEND)
+])
+
+# require package in debian/control.in append @DEB_DEPEND@ to Depends
+#  - parameter:
+#     $1 = package name
+AC_DEFUN([AX_DEB_SECTION], [
+  pkg=$1
+  DEB_SECTION="${pkg}"
+  AC_SUBST(DEB_SECTION)
+])

bootstrap.sh

@@ -690,9 +690,13 @@ ${CHEADER}#include <${PACKAGE_NAME}.hxx>
 #include <QApplication>
 #include <QCommandLineParser>
 #include <iostream>
+#include <version.hxx>
 
 int main(int argc, char *argv[]) try {
   QApplication a(argc, argv);
+  a.setApplicationDisplayName(a.tr("${PACKAGE_NAME}"));
+  a.setApplicationName(${PACKAGE_NAME}::package_name().c_str());
+  a.setApplicationVersion(${PACKAGE_NAME}::version().c_str());
   QCommandLineParser parser;
   parser.addHelpOption();
   parser.process(a);
@@ -725,6 +729,7 @@ class ${PackageName}: public QMainWindow, protected Ui::${PackageName} {
     Q_OBJECT;
   public:
     explicit ${PackageName}(QWidget *parent = 0): QMainWindow(parent) {
+      setTitle(tr("${PACKAGE_NAME}[*]"));
       setupUi(this);
     }
     virtual ~${PackageName}() {}
@@ -1470,12 +1475,12 @@ EOF
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @PACKAGER@
-Build-Depends: ${BUILD_DEPENDS}
+Build-Depends: ${BUILD_DEPENDS} @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
 
 Package: @PACKAGE_NAME@
-Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; fi)
+Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; else echo "@DEB_SECTION@"; fi)
 Architecture: any
-Depends: \${shlibs:Depends}, \${misc:Depends}
+Depends: \${shlibs:Depends}, \${misc:Depends} @DEB_DEPEND@
 Description: @DESCRIPTION@
 @README_DEB@
 $(      if testtag AX_USE_LIBTOOL; then
@@ -1484,7 +1489,7 @@ $(      if testtag AX_USE_LIBTOOL; then
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}
+Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS} @DEB_DEPEND@ @DEB_DEPEND_IFEXISTS@
 Description: @DESCRIPTION@ - Development Package
 @README_DEB@
 EOF2
@@ -1496,6 +1501,7 @@ README
 EOF
     to --condition AX_USE_LIBTOOL debian/${PACKAGE_NAME}.install <<EOF
 usr/lib/lib*.so.*
+usr/share/${PACKAGE_NAME}
 EOF
     to --condition AX_USE_LIBTOOL debian/${PACKAGE_NAME}-dev.install <<EOF
 usr/include/*
@@ -1503,7 +1509,6 @@ usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
 usr/lib/*.la
-usr/share/${PACKAGE_NAME}
 usr/share/doc/${PACKAGE_NAME}/html
 EOF
     to --mode "u=rwx,g=rwx,o=rx" debian/rules <<EOF

build-in-docker.conf

@@ -2,7 +2,7 @@
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
-##  -  on Sat, 07 January 2017 15:21:52 +0100
+##  -  on Thu, 02 February 2017 17:50:21 +0100
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8

configure.ac

@@ -2,7 +2,7 @@
 
 m4_define(x_package_name, libpcscxx)
 m4_define(x_major, 3)
-m4_define(x_minor, 3)
+m4_define(x_minor, 4)
 m4_include(ax_init_standard_project.m4)
 AC_INIT(x_package_name, x_version, x_bugreport, x_package_name)
 AM_INIT_AUTOMAKE([1.9 tar-pax])
@@ -38,6 +38,10 @@ AX_CHECK_QT([QTGUI], [QtCore QtGui], [QtWidgets])
 AX_CHECK_QT([QTNETWORK], [Qt5Network >= 5.2])
 CPPFLAGS="${CPPFLAGS} -DQT_NO_KEYWORDS"
 
+AX_DEB_BUILD_DEPEND(mrw-c++-dev)
+AX_DEB_DEPEND_IFEXISTS(libpkcs11-helper1-dev)
+AX_DEB_DEPEND_IFEXISTS(libp11-kit-dev)
+
 # libraries used
 if test -z "$MINGW"; then
    AX_PKG_REQUIRE([pcsc], [libpcsclite], [pcsclite.h])

debian/control.in

@@ -1,18 +1,18 @@
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @PACKAGER@
-Build-Depends: debhelper, fakeroot, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, doxygen, graphviz, mscgen, default-jre-headless|default-jre, qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, libssl-dev, libpkcs11-helper1-dev | libp11-kit-dev | libgnutls-dev, libpcsclite-dev, mrw-c++-dev
+Build-Depends: debhelper, fakeroot, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, doxygen, graphviz, mscgen, default-jre-headless|default-jre, qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
 
 Package: @PACKAGE_NAME@
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends} @DEB_DEPEND@
 Description: @DESCRIPTION@
 @README_DEB@
 
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= ${binary:Version}), debhelper, fakeroot, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, doxygen, graphviz, mscgen, default-jre-headless|default-jre, qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, libssl-dev, libpkcs11-helper1-dev | libp11-kit-dev | libgnutls-dev, libpcsclite-dev, mrw-c++-dev
+Depends: @PACKAGE_NAME@ (= ${binary:Version}), debhelper, fakeroot, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, doxygen, graphviz, mscgen, default-jre-headless|default-jre, qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools @DEB_DEPEND@ @DEB_DEPEND_IFEXISTS@
 Description: @DESCRIPTION@ - Development Package
 @README_DEB@

debian/docs

@@ -0,0 +1,2 @@
+NEWS
+README

debian/libpcscxx-dev.dirs

@@ -1,2 +0,0 @@
-usr/lib
-usr/include

debian/libpcscxx-dev.install

@@ -3,4 +3,4 @@ usr/lib/lib*.a
 usr/lib/lib*.so
 usr/lib/pkgconfig/*
 usr/lib/*.la
-usr/share/doc
+usr/share/doc/libpcscxx/html

debian/libpcscxx.dirs

@@ -1 +0,0 @@
-usr/lib

debian/libpcscxx.install

@@ -1,2 +1,2 @@
-usr/bin/*
 usr/lib/lib*.so.*
+

debian/rules

@@ -1,13 +1,12 @@
-!/usr/bin/make -f
+## @id $Id$
-# -*- makefile -*-
+##
-# Sample debian/rules that uses debhelper.
+## This file has been added:
-# This file was originally written by Joey Hess and Craig Small.
+##  - by bootstrap.sh
-# As a special exception, when this file is copied by dh-make into a
+##  -  on Thu, 02 February 2017 16:27:33 +0100
-# dh-make output file, you may use that output file without restriction.
+## Feel free to change it or even remove and rebuild it, up to your needs
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+##
-
+##       1         2         3         4         5         6         7         8
-# Uncomment this to turn on verbose mode.
+## 45678901234567890123456789012345678901234567890123456789012345678901234567890
-#export DH_VERBOSE=1
 
 %:
 	dh $@

resolve-debbuilddeps.sh

@@ -32,21 +32,24 @@ function install() {
 }
 
 TO_INSTALL=
+DEPS=
 
 if test -e debian/control.in -a ! -e debian/control; then
     for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
         if test -n "$(${DO} apt-cache policy -q ${f})" && ((! $(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')) && (! ${DO} dpkg -l "${f}")); then
-            TO_INSTALL+=" ${f}"
+            DEPS+=" ${f}"
         fi
     done
+    for f in $(sed -n 's, *AX_DEB_BUILD_DEPEND(\([^)]*\)).*,\1,p' configure.ac); do
+        DEPS+=" ${f}"
+    done
     trap "rm debian/control" INT TERM EXIT
-    sed 's,@DEB_DEPEND_IFEXISTS@,,g' debian/control.in | \
+    sed 's,@\(DEB_DEPEND_IFEXISTS\|AX_DEB_BUILD_DEPEND\|AX_DEB_DEPEND\)@,,g' debian/control.in | \
         sed 's,@[^@]*@, dummytext,g' > debian/control
 fi
 
 install dpkg-dev
-DEPS=$(LANG= ${DO} dpkg-checkbuilddeps 2>&1 || true)
+DEPS+=" $(LANG= ${DO} dpkg-checkbuilddeps 2>&1 | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')"
-DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')
 
 for pa in ${DEPS}; do
     if test ${pa//|/} = ${pa}; then