debian: New automatic versioning from release tags

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@707 270642c3-0616-0410-b53a-bc976706d245

diff --git a/SConstruct b/SConstruct
index 8dffb8c..54a772c 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -1,6 +1,6 @@
 # -*- python -*-
 
-import sys, glob, os.path, datetime, pwd, time, fnmatch
+import sys, glob, os.path, datetime, pwd, time, fnmatch, string
 sys.path.append('senfscons')
 import SENFSCons
 
@@ -28,7 +28,20 @@ def updateRevision(target, source, env):
         rev = rev[:-1]
     if 'm' in rev:
         rev = rev[:-1]
+    url = None
+    for line in os.popen("svn info"):
+        elts=line.split(':',1)
+        if elts[0] == 'URL':
+            url = elts[1].strip()
+    version = None
+    if '/tags/' in url:
+        version = url.rsplit('/',1)[-1].split('_',1)[0]
+        if version[0] not in string.digits:
+            version = None
+    if version is None:
+        version = '1:0r%s' % rev
     changelog = file('debian/changelog.template').read() % {
+        'version': version,
         'rev': rev,
         'user': pwd.getpwuid(os.getuid()).pw_gecos.split(',')[0].strip(),
         'date': time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()) }

diff --git a/debian/changelog.template b/debian/changelog.template
index 9ba62d6..be8d141 100644 (file)
--- a/debian/changelog.template
+++ b/debian/changelog.template
@@ -1,4 +1,4 @@
-libsenf (0.0r%(rev)s) unstable; urgency=low
+libsenf (%(version)s) unstable; urgency=low
 
   * Packaging revision %(rev)s
 

diff --git a/debian/control b/debian/control
index f82de4b..f11f92a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -35,8 +35,8 @@ Architecture: all
 Depends: binutils-dev, libboost-dev, libboost-regex-dev, 
        libboost-date-time-dev, libboost-thread-dev, libboost-serialization-dev,
        libboost-filesystem-dev, libsenf (=${source:Version}) | libsenf-dbg (=${source:Version})
-Recommends: libsenf (=${binary:Version}), libsenf-dbg (=${binary:Version})
-Suggests: libsenf-doc (=${binary:Version})
+Recommends: libsenf (=${source:Version}), libsenf-dbg (=${source:Version})
+Suggests: libsenf-doc (=${source:Version})
 Description: SENF Extensible Network Framework, header files
  The SENF Simple and Extensible Network Framework aims to be a
  complete set of libraries to facilitate the development of network