[Treepkg-commits] r253 - in trunk/recipes: gnupg wince/gnupg

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2010-03-17 14:42:42 +0100 (Wed, 17 Mar 2010)
New Revision: 253

Modified:
   trunk/recipes/gnupg/base.py
   trunk/recipes/wince/gnupg/base.py
Log:
Revisions are now handled as strings


Modified: trunk/recipes/gnupg/base.py
===================================================================
--- trunk/recipes/gnupg/base.py	2010-03-17 13:38:37 UTC (rev 252)
+++ trunk/recipes/gnupg/base.py	2010-03-17 13:42:42 UTC (rev 253)
@@ -44,7 +44,7 @@
                            % filename)
 
     def determine_package_version(self, directory):
-        return "%s+svn%d" % (self.orig_source_version(directory), self.revision)
+        return "%s+svn%s" % (self.orig_source_version(directory), self.revision)
 
     def do_package(self):
         pkgbaseversion, pkgbasedir = self.export_sources()
@@ -59,7 +59,7 @@
         # thus could not find the svn revision.
         treepkg.util.replace_in_file(os.path.join(pkgbasedir, "configure"),
                                      re.escape(orig_version) + "-svn0",
-                                     orig_version + "-svn%d" % self.revision)
+                                     orig_version + "-svn%s" % self.revision)
 
         pkgbasename = self.pkg_basename + "_" + pkgbaseversion
         origtargz = os.path.join(self.work_dir,
@@ -67,7 +67,7 @@
         self.create_tarball(origtargz, self.work_dir,
                             os.path.basename(pkgbasedir))
 
-        changemsg = ("Update to SVN rev. %d" % (self.revision,))
+        changemsg = ("Update to SVN rev. %s" % (self.revision,))
         self.copy_debian_directory(pkgbasedir, pkgbaseversion,
                                    changemsg)
 
@@ -181,7 +181,7 @@
         self.create_original_tarball()
         orig_dir = self.create_orig_dir()
 
-        changemsg = ("Update to SVN rev. %d" % (self.revision,))
+        changemsg = ("Update to SVN rev. %s" % (self.revision,))
         self.copy_debian_directory(orig_dir, self.pkgbaseversion, changemsg)
 
         self.create_source_package(orig_dir, self.origtargz)

Modified: trunk/recipes/wince/gnupg/base.py
===================================================================
--- trunk/recipes/wince/gnupg/base.py	2010-03-17 13:38:37 UTC (rev 252)
+++ trunk/recipes/wince/gnupg/base.py	2010-03-17 13:42:42 UTC (rev 253)
@@ -45,7 +45,7 @@
                            % filename)
 
     def determine_package_version(self, directory):
-        return "%s-svn%d" % (self.orig_source_version(directory), self.revision)
+        return "%s-svn%s" % (self.orig_source_version(directory), self.revision)
     def sign_package(self):
         return None
 
@@ -62,7 +62,7 @@
         # thus could not find the svn revision.
         treepkg.util.replace_in_file(os.path.join(pkgbasedir, "configure"),
                                      re.escape(orig_version) + "-svn0",
-                                     orig_version + "-svn%d" % self.revision)
+                                     orig_version + "-svn%s" % self.revision)
 
         pkgbasename = self.pkg_basename + "_" + pkgbaseversion
         origtargz = os.path.join(self.work_dir,
@@ -70,7 +70,7 @@
         self.create_tarball(origtargz, self.work_dir,
                             os.path.basename(pkgbasedir))
 
-        changemsg = ("Update to SVN rev. %d" % (self.revision,))
+        changemsg = ("Update to SVN rev. %s" % (self.revision,))
         self.copy_debian_directory(pkgbasedir, pkgbaseversion,
                                    changemsg)
 
@@ -191,7 +191,7 @@
         self.create_original_tarball()
         orig_dir = self.create_orig_dir()
 
-        changemsg = ("Update to SVN rev. %d" % (self.revision,))
+        changemsg = ("Update to SVN rev. %s" % (self.revision,))
         self.copy_debian_directory(orig_dir, self.pkgbaseversion, changemsg)
 
         self.create_source_package(orig_dir, self.origtargz)