add support for binary shim packages

diff --git a/auto_debuild.py b/auto_debuild.py
index 441302c0f19d6a71670e9850fa0f870ad4dee917..d3a6527da1dd9427bc3f22c8ac56a8c6db34a506 100755 (executable)
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -201,7 +201,8 @@ def createDebianFiles(config):
        email = config.getstr('email', os.getenv('USER')+'@'+os.uname()[1]) # user@hostname
        debDir = os.path.expanduser(config.getstr('debDir'))
        buildSystem = buildSystems[config.getstr('buildSystem')] # get the data immediately
-       version = config.getstr('version')
+       version = config.getstr('version') # version name excluding epoch (used for filenames)
+       fullVersion = str(config.getint('epoch'))+':'+version if 'epoch' in config else version # version name including epoch
        dbgPackage = config.getbool('dbgPackage', False)
        parallelJobs = config.getint('parallelJobs', 2)
        packageArchitecture = config.getstr('architecture', 'any')
@@ -227,19 +228,21 @@ def createDebianFiles(config):
                print >>f, "Auto-generated by auto-debuild, not suited for distribution"
        # changelog file
        with open('debian/changelog', 'w') as f:
-               print >>f, sourceName,"("+version+")","UNRELEASED; urgency=low"
+               print >>f, sourceName,"("+fullVersion+")","UNRELEASED; urgency=low"
                print >>f, ""
                print >>f, "  * Auto-generated by auto-debuild"
                print >>f, ""
                print >>f, " --",name,"<"+email+">  "+time.strftime('%a, %d %b %Y %H:%M:%S %z')
        # control file
        with open('debian/control', 'w') as f:
+               # source package
                print >>f, "Source:",sourceName
                print >>f, "Section:",config.getstr('section', 'misc')
                print >>f, "Priority: extra"
                print >>f, "Maintainer: %s <%s>" % (name, email)
                writeDependency(f, 'Build-Depends', ["debhelper (>= 9)"] + buildSystem.buildDepends + config.get('buildDepends', []))
                print >>f, "Standards-Version: 3.9.3"
+               # main binary package
                print >>f, ""
                print >>f, "Package:",binaryName
                print >>f, "Architecture:",packageArchitecture
@@ -256,6 +259,7 @@ def createDebianFiles(config):
                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)))
+               # debug package
                if dbgPackage:
                        print >>f, ""
                        print >>f, "Package:",binaryName+"-dbg"
@@ -266,6 +270,17 @@ def createDebianFiles(config):
                        print >>f, "Description:",sourceName,"debug smbols (auto-debuild)"
                        print >>f, " Package containing debug symbols for "+sourceName+", auto-generated by auto-debuild."
                        files.append(os.path.join(debDir, "%s-dbg_%s_%s.deb" % (binaryName, version, arch)))
+               # shim packages
+               for shim in config.get('binaryShims', []):
+                       print >>f, ""
+                       print >>f, "Package:",shim
+                       print >>f, "Section:",config.getstr('section', 'misc')
+                       print >>f, "Priority: extra"
+                       print >>f, "Architecture:",packageArchitecture
+                       writeDependency(f, "Depends", ["${misc:Depends}", binaryName+" (= ${binary:Version})"])
+                       print >>f, "Description:",sourceName,"shim for",shim,"(auto-debuild)"
+                       print >>f, " Package pretending to be "+shim+", auto-generated by auto-debuild."
+                       files.append(os.path.join(debDir, "%s_%s_%s.deb" % (shim, version, arch)))
        # install file
        with open('debian/'+binaryName+'.install', 'w') as f:
                for line in config.get('binaryInstallFiles', []):
@@ -321,10 +336,11 @@ def createDebianFiles(config):
                if 'binarySkipFiles' in config:
                        if not 'auto_install' in r.rules: r.rules['auto_install'] = ['dh_auto_install'] # make sure there is an override
                        r.rules['auto_install'].append(safeCall('cd', 'debian/'+binaryName) + " && " + safeCall('rm', *config.get('binarySkipFiles')))
-               # for debug packages
+               # debug packages
                if dbgPackage:
                        r.rules['strip'] = [safeCall('dh_strip', '--dbg-package='+binaryName+"-dbg")] # put debug files in appropriate package
-                       r.rules['installdocs'] = [safeCall('dh_installdocs', '--link-doc='+binaryName)] # make the doc folder of the dbg package a symlink
+               # make the doc folder of the other packages a symlink (dbg, shims)
+               r.rules['installdocs'] = [safeCall('dh_installdocs', '--link-doc='+binaryName)]
                # wait after configuration?
                if config.getbool('waitAfterConfig', False):
                        if not 'auto_configure' in r.rules: r.rules['auto_configure'] = ['dh_auto_configure'] # make sure there is an override
@@ -342,7 +358,7 @@ def buildDebianPackage(config):
        commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary']
        command = ['bash', '-c', ' && '.join(commands)] # make it all one command, so we don't have to open and close the chroot too often
        subprocess.check_call(commandInBuildEnv(config, command))
-       shutil.rmtree('debian') # it only contains what we just created
+       shutil.rmtree('debian') # cleanup: the debian folder only contains what we just created
 
 ###################################################################
 # if we are called directly as script