--- a/recipes/kde_enterprise_4/kdepim.py	Tue Jan 06 16:39:52 2009 +0000
+++ b/recipes/kde_enterprise_4/kdepim.py	Tue Jan 06 16:45:38 2009 +0000
@@ -1,34 +1,23 @@
-# Copyright (C) 2007, 2008 by Intevation GmbH
+# Copyright (C) 2007, 2008, 2009 by Intevation GmbH
 # Authors:
 # Bernhard Herzog <bh@intevation.de>
 #
 # This program is free software under the GPL (>=v2)
 # Read the file COPYING coming with the software for details.
 
-"""Packager that builds KDE-PIM debian packages from the enterprise35 branch.
+"""Build kdepim debian packages from the kdepim/enterprise4 branch.
 """
 
 import os
-import time
-import re
 
 import treepkg.util
-import treepkg.packager
 
+import base
 
-class SourcePackager(treepkg.packager.SourcePackager):
+class SourcePackager(base.BaseSourcePackager):
 
     pkg_basename = "kdepim"
 
-    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 update_version_numbers(self, pkgbasedir):
         """Overrides the inherited method to update version numbers in the code
         """
@@ -47,36 +36,5 @@
             raise RuntimeError("kdepim: failed to update version numbers in %s"
                                % (", ".join(failed),))
 
-    def do_package(self):
-        pkgbaseversion, pkgbasedir = self.export_sources()
-        self.update_version_numbers(pkgbasedir)
-
-        pkgbasename = "kdepim_" + 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 enterprise35 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):
-
-    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)
+base.define_kdepim_packager()