fixed debian and docker build
This commit is contained in:
		@@ -1,4 +1,19 @@
 | 
				
			|||||||
repos+=("Debian|Ubuntu-precise::::::universe")
 | 
					## @id $Id$
 | 
				
			||||||
repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
 | 
					##
 | 
				
			||||||
envs+=("-e 'HOME=${HOME}'")
 | 
					## This file has been added:
 | 
				
			||||||
dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro")
 | 
					##  - by bootstrap.sh
 | 
				
			||||||
 | 
					##  -  on Wed, 15 March 2017 09:00:57 +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")
 | 
				
			||||||
 | 
					repos+=("CentOS:::https://dev.marc.waeckerlin.org/repository/centos/marc-waeckerlin.repo")
 | 
				
			||||||
 | 
					keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey")
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,5 +30,8 @@ AX_USE_RPM_PACKAGING
 | 
				
			|||||||
AX_REQUIRE_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
 | 
					AX_REQUIRE_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
 | 
				
			||||||
#AX_QT_NO_KEYWORDS
 | 
					#AX_QT_NO_KEYWORDS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					AX_DEB_SECTION(utils)
 | 
				
			||||||
 | 
					AX_DEB_RESOLVE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# create output
 | 
					# create output
 | 
				
			||||||
AC_OUTPUT
 | 
					AC_OUTPUT
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								debian/changelog.in
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								debian/changelog.in
									
									
									
									
										vendored
									
									
								
							@@ -1,5 +1,5 @@
 | 
				
			|||||||
@PACKAGE@ (@PACKAGE_VERSION@~@DISTRO@.@BUILD_NUMBER@) @DISTRO@; urgency=low
 | 
					@PACKAGE@ (@PACKAGE_VERSION@~@DISTRO@.@BUILD_NUMBER@) @DISTRO@; urgency=low
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  * Please see ChangeLog of @PACKAGE@
 | 
					@DEB_CHANGELOG@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 -- @AUTHOR@  @BUILD_DATE@
 | 
					 -- @PACKAGER@  @BUILD_DATE@
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										8
									
								
								debian/control.in
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								debian/control.in
									
									
									
									
										vendored
									
									
								
							@@ -1,12 +1,12 @@
 | 
				
			|||||||
Source: @PACKAGE_NAME@
 | 
					Source: @PACKAGE_NAME@
 | 
				
			||||||
Priority: extra
 | 
					Priority: extra
 | 
				
			||||||
Maintainer: @AUTHOR@
 | 
					Maintainer: @PACKAGER@
 | 
				
			||||||
Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen, 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
 | 
					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@
 | 
					Package: @PACKAGE_NAME@
 | 
				
			||||||
Section: utils
 | 
					Section: @DEB_SECTION@
 | 
				
			||||||
Architecture: any
 | 
					Architecture: any
 | 
				
			||||||
Depends: ${shlibs:Depends}, ${misc:Depends}
 | 
					Depends: ${shlibs:Depends}, ${misc:Depends} @DEB_DEPEND@
 | 
				
			||||||
Description: @DESCRIPTION@
 | 
					Description: @DESCRIPTION@
 | 
				
			||||||
@README_DEB@
 | 
					@README_DEB@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										10
									
								
								debian/rules
									
									
									
									
										vendored
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
									
										10
									
								
								debian/rules
									
									
									
									
										vendored
									
									
										
										
										Normal file → Executable file
									
								
							@@ -1,8 +1,10 @@
 | 
				
			|||||||
## @id $Id$
 | 
					## @id $Id$
 | 
				
			||||||
#
 | 
					##
 | 
				
			||||||
# This file has been added by bootstrap.sh on Thu, 08 October 2015 11:04:32 +0200
 | 
					## This file has been added:
 | 
				
			||||||
# Feel free to change it or even remove and rebuild it, up to your needs
 | 
					##  - by bootstrap.sh
 | 
				
			||||||
#
 | 
					##  -  on Wed, 15 March 2017 09:00:57 +0100
 | 
				
			||||||
 | 
					## Feel free to change it or even remove and rebuild it, up to your needs
 | 
				
			||||||
 | 
					##
 | 
				
			||||||
##       1         2         3         4         5         6         7         8
 | 
					##       1         2         3         4         5         6         7         8
 | 
				
			||||||
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 | 
					## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user