[Treepkg-commits] r146 - trunk/recipes/kde_enterprise_4

[scm-commit@wald.intevation.org]

Author: bh
Date: 2009-01-06 17:39:52 +0100 (Tue, 06 Jan 2009)
New Revision: 146

Modified:
   trunk/recipes/kde_enterprise_4/kdebase_workspace.py
Log:
Use the recipes.kde_enterprise_4.base module to define the kdebase_workspace
packager


Modified: trunk/recipes/kde_enterprise_4/kdebase_workspace.py
===================================================================
--- trunk/recipes/kde_enterprise_4/kdebase_workspace.py	2009-01-06 16:34:01 UTC (rev 145)
+++ trunk/recipes/kde_enterprise_4/kdebase_workspace.py	2009-01-06 16:39:52 UTC (rev 146)
@@ -1,65 +1,14 @@
-# Copyright (C) 2007, 2008 by Intevation GmbH
+# Copyright (C) 2007, 2008, 2009 by Intevation GmbH
 # Authors:
 # Bernhard Herzog <bh at intevation.de>
 #
 # This program is free software under the GPL (>=v2)
 # Read the file COPYING coming with the software for details.
 
-"""Build kdebase_runtime debian packages from the kdepim/enterprise4 branch."""
+"""Build kdebase-workspace debian packages from the kdepim/enterprise4 branch.
+"""
 
-import os
-import time
-import re
-
-import treepkg.util
-import treepkg.packager
-
-
-class SourcePackager(treepkg.packager.SourcePackager):
-
-    pkg_basename = "kdebase-workspace"
-
-    def __init__(self, *args, **kw):
-        super(SourcePackager, self).__init__(*args, **kw)
-        self.enterprise_version = (time.strftime("%Y%m%d", time.localtime()) \
-                                   + "." + str(self.revision))
-
-    def determine_package_version(self, directory):
-        enterprise_version = self.enterprise_version
-        return self.track.version_template % locals()
-
-    def do_package(self):
-        pkgbaseversion, pkgbasedir = self.export_sources()
-
-        pkgbasename = self.pkg_basename + "_" + pkgbaseversion
-        origtargz = os.path.join(self.work_dir,
-                                 pkgbasename + ".orig.tar.gz")
-        self.create_tarball(origtargz, self.work_dir,
-                            os.path.basename(pkgbasedir))
-
-        changemsg = ("Update to SVN enterprise4 branch rev. %d"
-                     % (self.revision,))
-        self.copy_debian_directory(pkgbasedir, pkgbaseversion,
-                                   changemsg)
-
-        self.create_source_package(pkgbasedir, origtargz)
-        self.move_source_package(pkgbasename)
-
-
-class RevisionPackager(treepkg.packager.RevisionPackager):
-
-    source_packager_cls = SourcePackager
-
-
-class PackageTrack(treepkg.packager.PackageTrack):
-
-    svn_external_subdirs = ["kwin/clients/ozone/lib",
-                            "kwin/clients/oxygen/lib"]
-
-    extra_config_desc = ["version_template"]
-
-    revision_packager_cls = RevisionPackager
-
-    def __init__(self, *args, **kw):
-        self.version_template = kw.pop("version_template")
-        super(PackageTrack, self).__init__(*args, **kw)
+import base
+base.define_kdepim_packager("kdebase-workspace",
+                            external_subdirs=["kwin/clients/ozone/lib",
+                                              "kwin/clients/oxygen/lib"])