packager fixed

8 years ago · b716b41a45
parent 6e8e665da7
commit b716b41a45
9 changed files with 32 additions and 92 deletions
--- a/15
+++ b/15
@ -1,3 +1,18 @@
 2017-01-20 08:30  
 	* [r91] COPYING, INSTALL, README, configure.ac, src/commands.hxx,
 	  src/networkaccessmanager.hxx, src/testgui.hxx, src/webrunner.cxx:
 	  new option for timeout, longer timeout in shell, new untested
 	  command auth to set basic authentication credentials
 2017-01-07 12:09  
 	* [r90] ChangeLog, bootstrap.sh, build-in-docker.sh,
 	  doc/footer.html.in[ADD], doc/header.html.in[ADD],
 	  doc/plantuml.jar[ADD], doc/style.css[ADD],
 	  makefile_test.inc.am[ADD]:
 	  build fixed
 2017-01-06 15:53  
 	* [r89] COPYING, ChangeLog, INSTALL, ax_cxx_compile_stdcxx_11.m4,
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -1741,7 +1741,7 @@ to build-in-docker.conf <<EOF
 ${HEADER}# Use Ubuntu Universe Repository
 repos+=("Ubuntu:::universe")
-# Use Marc Wäckselin's Repository, see https://dev.marc.waeckerlin.org
+# Use Marc Wäckerlin's Repository, see https://dev.marc.waeckerlin.org
 repos+=("Debian|Ubuntu:::https://dev.marc.waeckerlin.org/repository")
 repos+=("openSUSE:::https://dev.marc.waeckerlin.org/repository/opensuse/marc-waeckerlin.repo")
 repos+=("Fedora:::https://dev.marc.waeckerlin.org/repository/fedora/marc-waeckerlin.repo")
--- a/build-in-docker.conf
+++ b/build-in-docker.conf
@ -1,4 +1,17 @@
 ## @id $Id$
 ##
 ## This file has been added:
 ##  - by bootstrap.sh
 ##  -  on Fri, 20 January 2017 11:56:47 +0100
 ## Feel free to change it or even remove and rebuild it, up to your needs
 ##
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 # Use Ubuntu Universe Repository
 repos+=("Ubuntu:::universe")
 # Use Marc Wäckerlin's Repository, see https://dev.marc.waeckerlin.org
 repos+=("Debian|Ubuntu:::https://dev.marc.waeckerlin.org/repository")
 repos+=("openSUSE:::https://dev.marc.waeckerlin.org/repository/opensuse/marc-waeckerlin.repo")
 repos+=("Fedora:::https://dev.marc.waeckerlin.org/repository/fedora/marc-waeckerlin.repo")
--- a/debian/changelog.in
+++ b/debian/changelog.in
@ -1,5 +1,5 @@
@PACKAGE@ (@PACKAGE_VERSION@~@DISTRO@.@BUILD_NUMBER@) @DISTRO@; urgency=low
-  * Please see ChangeLog of @PACKAGE@
+@DEB_CHANGELOG@
- -- @AUTHOR@  @BUILD_DATE@
+ -- @PACKAGER@  @BUILD_DATE@
--- a/doc/footer.html.in
+++ b/doc/footer.html.in
@ -1,8 +0,0 @@
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
  <ul>
    $navpath
    <li class="footer"><a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a></li>
  </ul>
 </div>
 </body>
 </html>
--- a/doc/header.html.in
+++ b/doc/header.html.in
@ -1,33 +0,0 @@
 <!-- HTML header for doxygen 1.8.6-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen $doxygenversion"/>
 <!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
 <!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
 <link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="$relpath^jquery.js"></script>
 <script type="text/javascript" src="$relpath^dynsections.js"></script>
 $treeview
 $search
 $mathjax
 <link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
 $extrastylesheet
 </head>
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 <div id="titlearea">
  <div id="projecthead">
    <div id="projectlogo"><img alt="" src="$relpath^$projectlogo"/></div>
    <div id="projectname">$projectname</span>&#160;<span id="projectnumber">$projectnumber</div>
    <div id="projectbrief">$projectbrief</div>
  </div>
  <nav>
    <a href="@PROJECT_URL@" target="_blank">Project Management</a>
    <a href="@SOURCE_DOWNLOAD@" target="_blank">Download</a>
    <div>$searchbox</div>
  </nav>
 </div>
--- a/doc/plantuml.jar
+++ b/doc/plantuml.jar
--- a/doc/style.css
+++ b/doc/style.css
@ -1,38 +0,0 @@
 #titlearea {
  display: flex;
  justify-content: space-between;
  align-items: flex-begin;
 }
 #titlearea nav {
  padding: 0;
  margin: 0;
 }
 #titlearea nav a {
  background-color: lightgray;
  border: 1px solid gray;
  color: black;
  padding: 1ex;
  margin: 0;
 }
 img, object {
  max-width: 100% !important;
 }
@media (max-width: 50em) {
  #navrow1, #navrow2 {
    display: block
  }
  #side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
    display: none;
  }
  #doc-content {
    margin-left: 0 !important;
  }
 }
@media (min-width: 50em) {
  #navrow1, #navrow2 {
    display: none;
  }
  #side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
    display: block
  }
 }
--- a/makefile_test.inc.am
+++ b/makefile_test.inc.am
@ -1,9 +0,0 @@
 ## @id $Id$
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 %.gcda: %
 	gcov $<
 CLEANFILES += ${CLEANFILES} ${TEST:%=%.gcno} ${TEST:%=%.gcda} *.gcov