X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/a9d4d5c4a1be0311e53747b98dfd74cabcb8108d..788304be20de6f447515f899119166f0c22b0c4a:/auto_debuild.py?ds=inline

diff --git a/auto_debuild.py b/auto_debuild.py
index 61d7efc..eb0f1cd 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -98,7 +98,7 @@ def pythonRules(config):
 # build systems
 buildSystems = {
 	'cmake': BuildSystem(cmakeRules, ["cmake"]),
-	'automake': BuildSystem(automakeRules, ["automake"]),
+	'automake': BuildSystem(automakeRules),
 	'python': BuildSystem(pythonRules, ["python-setuptools"], ["${python:Depends}"]),
 }
 
@@ -169,18 +169,24 @@ def createDebianFiles(config):
 		print >>f, ""
 		print >>f, "Package:",binaryName
 		print >>f, "Architecture:",packageArchitecture
+		if 'binaryMultiArch' in config:
+			print >>f, "Multi-Arch:",config['binaryMultiArch']
 		writeDependency(f, "Pre-Depends", ["${misc:Pre-Depends}"] + config.get('binaryPreDepends', []))
 		writeDependency(f, "Depends", ["${shlibs:Depends}", "${misc:Depends}"] + buildSystem.binaryDepends +
 			config.get('binaryDepends', []))
 		writeDependency(f, "Recommends", config.get('binaryRecommends', []))
 		writeDependency(f, "Provides", config.get('binaryProvides', [sourceName]))
 		writeDependency(f, "Conflicts", config.get('binaryConflicts', []))
+		writeDependency(f, "Breaks", config.get('binaryBreaks', []) + config.get('binaryBreaksReplaces', []))
+		writeDependency(f, "Replaces", config.get('binaryReplaces', []) + config.get('binaryBreaksReplaces', []))
 		print >>f, "Description:",sourceName,"(auto-debuild)"
 		print >>f, " Package auto-generated by auto-debuild."
 		files.append(os.path.join(debDir, "%s_%s_%s.deb" % (binaryName, version, arch)))
 		if dbgPackage:
 			print >>f, ""
 			print >>f, "Package:",binaryName+"-dbg"
+			print >>f, "Section: debug"
+			print >>f, "Priority: extra"
 			print >>f, "Architecture:",packageArchitecture
 			writeDependency(f, "Depends", ["${misc:Depends}", binaryName+" (= ${binary:Version})"])
 			print >>f, "Description:",sourceName,"debug smbols (auto-debuild)"
@@ -244,6 +250,7 @@ def createDebianFiles(config):
 			r.rules['installdocs'] = [safeCall('dh_installdocs', '--link-doc='+binaryName)] # make the doc folder of the dbg package a symlink
 		# wait after configuration?
 		if config.get('waitAfterConfig', False):
+			if not 'auto_configure' in r.rules: r.rules['auto_configure'] = ['dh_auto_configure'] # make sure there is an override
 			r.rules['auto_configure'].append("@"+safeCall('read', '-p', 'Configuration done. Hit "Enter" to build the package. ', 'DUMMY_VAR')) # if we run in dash, we need to tell it which variable to use for the result...
 		# dump it to a file
 		r.write(f)