Change templates directory.

data/login.d/10client

@@ -15,7 +15,7 @@
 
 env-update
 source /etc/profile
-source /usr/share/calculate-2.2/xdm/functions
+source /usr/share/calculate/xdm/functions
 
 if [ -e '/usr/bin/cl-sync' ];
 then

data/logout.d/10client

@@ -15,7 +15,7 @@
 
 env-update
 source /etc/profile
-source /usr/share/calculate-2.2/xdm/functions
+source /usr/share/calculate/xdm/functions
 
 if [ -e '/usr/bin/cl-sync' ];
 then

setup.cfg

@@ -2,4 +2,4 @@
 install-scripts=/usr/bin
 install-purelib=/usr/lib/calculate-2.2
 install-platlib=/usr/lib/calculate-2.2
-install-data=/usr/share/calculate-2.2/templates
+install-data=/usr/share/calculate/templates

setup.py

@@ -35,7 +35,7 @@ var_data_files = []
 
 data_dirs_template = ['templates']
 data_dirs_share = ['i18n']
-share_calculate_dir = "/usr/share/calculate-2.2"
+share_calculate_dir = "/usr/share/calculate"
 template_calculate_dir = os.path.join(share_calculate_dir, "templates")
 template_replace_dirname = "client" 
 
@@ -74,11 +74,11 @@ data_files += create_data_files (data_dirs_template, template_calculate_dir,
                                  template_replace_dirname)
 data_files += create_data_files (data_dirs_share, share_calculate_dir)
 data_files += [('/etc/init.d', ['data/client'])]
-data_files += [('/usr/share/calculate-2.2/xdm/login.d',
+data_files += [('/usr/share/calculate/xdm/login.d',
                                                 ['data/login.d/10client'])] +\
-              [('/usr/share/calculate-2.2/xdm/logout.d',
+              [('/usr/share/calculate/xdm/logout.d',
                                                 ['data/logout.d/10client'])] +\
-              [('/usr/share/calculate-2.2/xdm/',['data/wait_domain'])] +\
+              [('/usr/share/calculate/xdm/',['data/wait_domain'])] +\
               [('/var/calculate/templates', [])]
 
 
@@ -86,7 +86,7 @@ class cl_install_data(install_data):
     def run (self):
         install_data.run(self)
         data_file = [("/etc/init.d/client",0755),
-                     ("/usr/share/calculate-2.2/xdm/wait_domain",0755)]
+                     ("/usr/share/calculate/xdm/wait_domain",0755)]
         fileNames = map(lambda x: os.path.split(x[0])[1], data_file)
         listNames = map(lambda x: filter(lambda y: y, x[0].split("/")),data_file)
         data_find = {}

templates/domain/gdm/Init/05Default

@@ -1,6 +1,6 @@
 # Calculate chmod=755 name=Default
 #!/bin/bash
 
-/usr/share/calculate-2.2/xdm/wait_domain
+/usr/share/calculate/xdm/wait_domain
 OLDDEFAULT=/etc/X11/gdm/Init/Default.old
 [[ -f $OLDDEFAULT ]] && source $OLDDEFAULT

templates/domain/kdm/kdmrc

@@ -1,6 +1,6 @@
 # Calculate format=kde path=/usr/share/config/kdm 
 [X-*-Core]
-Setup=/usr/share/calculate-2.2/xdm/wait_domain
+Setup=/usr/share/calculate/xdm/wait_domain
 [X-*-Greeter]
 #?env(unix.sr_unix_min_id)!=#
 MinShowUID=#-env(unix.sr_unix_min_id)-#