X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/b6fc6eb7df538eb1590944760beed6d8d859953a..bc80860e910048709d5d405e5148cae6c75a0dc6:/auto_debuild.py?ds=sidebyside

diff --git a/auto_debuild.py b/auto_debuild.py
index 17edd4e..c7a7628 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -101,6 +101,7 @@ def createDebianFiles(config):
 	dbgPackage = config.get('dbgPackage', False)
 	parallelJobs = int(config.get('parallelJobs', 2))
 	packageArchitecture = config.get('architecture', 'any')
+	withPython2 = config.get('withPython2', False)
 	# we return the list of files generated, so we need to know the architecture
 	arch = getArchitecture(config)
 	files = []
@@ -140,6 +141,7 @@ def createDebianFiles(config):
 		writeDependency(f, "Depends", ["${shlibs:Depends}", "${misc:Depends}"] + config.get('binaryDepends', []))
 		writeDependency(f, "Recommends", config.get('binaryRecommends', []))
 		writeDependency(f, "Provides", config.get('binaryProvides', [sourceName]))
+		writeDependency(f, "Conflicts", config.get('binaryConflicts', []))
 		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)))
@@ -173,6 +175,9 @@ def createDebianFiles(config):
 			r.env["DEB_CFLAGS_APPEND"] = '-g0'
 			r.env["DEB_CXXFLAGS_APPEND"] = '-g0'
 		r.dh += ['--parallel']
+		if withPython2:
+			r.dh += ['--with=python2']
+			r.rules['python2'] = ['dh_python2 --no-guessing-versions']
 		r.rules['builddeb'] = [safeCall('dh_builddeb', "--destdir="+debDir)] # passing this gobally to dh results in weird problems (like stuff being installed there, and not in the package...)
 		r.rules['auto_test'] = []
 		# installation rule