From 48920d95643bb104eda3299a4035fbe5ccad95c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Sat, 19 Nov 2016 11:42:21 +0000
Subject: [PATCH] updated build

---
 COPYING                     |  2 +-
 INSTALL                     |  2 +-
 ax_init_standard_project.m4 | 22 +++++++++++++++-------
 bootstrap.sh                | 16 +++++++++-------
 debian-chroots.spec.in      |  3 ++-
 debian/control.in           |  9 ++++-----
 6 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/COPYING b/COPYING
index caeca07..88798ab 120000
--- a/COPYING
+++ b/COPYING
@@ -1 +1 @@
-/usr/share/automake-1.14/COPYING
\ No newline at end of file
+/usr/share/automake-1.15/COPYING
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
index f812f5a..ddcdb76 120000
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-/usr/share/automake-1.14/INSTALL
\ No newline at end of file
+/usr/share/automake-1.15/INSTALL
\ No newline at end of file
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 4f63768..953c882 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -7,7 +7,7 @@
 m4_define([mrw_esyscmd_s], [m4_normalize(m4_esyscmd([$1]))])
 
 # define least version number from subversion's revision number:
-# it is taken modulo 256 due to a bug on Apple's SX
+# it is taken modulo 256 due to a bug on Apple's MaxOSX
 m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
   m4_ifdef([x_least_diff],
     mrw_esyscmd_s([
@@ -36,10 +36,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
         fi
       done
       # Mac does not support LEAST > 255
-      echo $ECHO_N $(($VCS_REVISION%256))
-    ])
-  )
-))
+      echo $ECHO_N $(($VCS_REVISION%256))]))))
 
 # define version number from subversion's revision number:
 # it is taken modulo 256 due to a bug on Apple's MacOSX
@@ -57,8 +54,8 @@ m4_define(x_minor_diff, m4_ifdef([x_least_fix], 0, mrw_esyscmd_s([
     fi;
   done
   # Mac does not support LEAST > 255
-  echo $ECHO_N $(($VCS_REVISION/256))
-])))
+  echo $ECHO_N $(($VCS_REVISION/256))])))
+
 # setup version number
 m4_define(x_version, [x_major.m4_ifdef([x_least_diff], x_minor, m4_eval(x_minor+x_minor_diff)).m4_eval(m4_ifdef([x_least_diff], [x_least-x_least_diff], [x_least]))])
 
@@ -196,15 +193,26 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   COPYING=$(<COPYING)
   AX_SUBST(COPYING)
   _AM_SUBST_NOTMAKE([COPYING])
+  CHANGELOG=$(<ChangeLog)
+  AX_SUBST(CHANGELOG)
+  _AM_SUBST_NOTMAKE([CHANGELOG])
+  DEB_CHANGELOG=$(sed '/^[[^\t]]/{h;N;d};/^\t\* /{s,,,;H;g;s,^,\t* ,;s,\n\([[^ ]]*\) *, \1\n\t  ,}' ChangeLog)
+  AX_SUBST(DEB_CHANGELOG)
+  _AM_SUBST_NOTMAKE([DEB_CHANGELOG])
   AUTHOR=$(head -1 AUTHORS)
   AUTHOR_NAME=$(echo $AUTHOR | sed 's, *[[<(]].*$,,')
   AUTHOR_URL=$(echo $AUTHOR | sed 's,.*(\(http[[^)]]*\)).*,\1,')
   AUTHOR_MAIL=$(echo $AUTHOR | sed 's,.*<\(.*@.*\)>.*,\1,')
+  PACKAGER=$(gpg -K 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
+  if -z "${PACKAGER}"; then
+    PACKAGER="$AUTHOR"
+  fi
   AX_SUBST(AUTHOR)
   _AM_SUBST_NOTMAKE([AUTHOR])
   AX_SUBST(AUTHOR_NAME)
   AX_SUBST(AUTHOR_URL)
   AX_SUBST(AUTHOR_MAIL)
+  AX_SUBST(PACKAGER)
   PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}"
   SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
   AX_SUBST(PROJECT_URL)
diff --git a/bootstrap.sh b/bootstrap.sh
index f44efb9..5acee07 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -284,11 +284,11 @@ VCS=""
 VCSDEPENDS=""
 if test -d .svn; then
     VCS="svn"
-    VCSDEPENDS="subversion,"
+    VCSDEPENDS="svn2cl, subversion, subversion-tools,"
     echo -e " \e[32msuccess\e[0m detected ${VCS}"
 elif test -d .git; then
     VCS="git"
-    VCSDEPENDS="git,"
+    VCSDEPENDS="git2cl, git,"
     echo -e " \e[32msuccess\e[0m detected ${VCS}"
 else
     echo -e " \e[33mignored\e[0m"
@@ -487,6 +487,8 @@ vcs2cl() {
     if test -x $(which ${VCS}2cl); then
         if test "${VCS}" = "git"; then
             ${VCS}2cl > ChangeLog
+        elif test "${VCS}" = "svn"; then
+            ${VCS}2cl --break-before-msg -a -i
         elif test -n "${VCS}"; then
             ${VCS}2cl
         fi
@@ -518,7 +520,7 @@ copy build-in-docker.sh
 copy build-resource-file.sh
 copy sql-to-dot.sed
 copy mac-create-app-bundle.sh
-AUTHOR=$(gpg -K  | sed -n 's,uid *,,p' | sort | head -1)
+AUTHOR=$(gpg -K 2>/dev/null | sed -n 's,uid *\(\[ultimate\] *\)\?,,p' | head -1)
 if test -z "${AUTHOR}"; then
     AUTHOR="FIRSTNAME LASTNAME (URL) <EMAIL>"
 fi
@@ -1096,15 +1098,15 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
     to debian/changelog.in <<EOF
 @PACKAGE@ (@PACKAGE_VERSION@~@DISTRO@.@BUILD_NUMBER@) @DISTRO@; urgency=low
 
-  * Please see ChangeLog of @PACKAGE@
+@DEB_CHANGELOG@
 
- -- @AUTHOR@  @BUILD_DATE@
+ -- @PACKAGER@  @BUILD_DATE@
 EOF
-    BUILD_DEPENDS="debhelper, ${VCSDEPENDS} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_PLANTUML; then echo -n ", default-jre-headless|default-jre"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", 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"; fi)"
+    BUILD_DEPENDS="debhelper, ${VCSDEPENDS} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, fakeroot, $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_PLANTUML; then echo -n ", default-jre-headless|default-jre"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", 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"; fi)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
-Maintainer: @AUTHOR@
+Maintainer: @PACKAGER@
 Build-Depends: ${BUILD_DEPENDS}
 
 Package: @PACKAGE_NAME@
diff --git a/debian-chroots.spec.in b/debian-chroots.spec.in
index 4a3e174..88bf567 100644
--- a/debian-chroots.spec.in
+++ b/debian-chroots.spec.in
@@ -6,7 +6,7 @@ License: LGPL
 Group: Applications/...
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gnupg, subversion, automake, autoconf, doxygen
+BuildRequires: gnupg, svn2cl, subversion, subversion-tools, make, automake, autoconf, rpm-build, doxygen
 %if 0%{?fedora} != 20
 BuildRequires: graphviz
 %endif
@@ -51,6 +51,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 /usr/bin/*
+/usr/share/applications/*
 %doc
 /usr/share/*
 
diff --git a/debian/control.in b/debian/control.in
index 77aac02..48db48c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,13 +1,12 @@
 Source: @PACKAGE_NAME@
 Priority: extra
-Maintainer: @AUTHOR@
-Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen
+Maintainer: @PACKAGER@
+Build-Depends: debhelper, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, fakeroot, , doxygen, graphviz, mscgen
 
 Package: @PACKAGE_NAME@
-Section: development
+Section: 
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debootstrap, coreutils
-Recommends: qemu-user-static, lxc-docker, schroot
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: @DESCRIPTION@
 @README_DEB@