[Debian-in-commits] [SCM] dh-make-font.git branch, master, updated. 9e8fffd26ff89979228d84d8795a544877ecbede

[Vasudev Kamath]

The following commit has been merged in the master branch:
commit 9e8fffd26ff89979228d84d8795a544877ecbede
Author: Vasudev Kamath <kamathvasudev at gmail.com>
Date:   Fri Dec 23 20:48:01 2011 +0530

    Fix: more than one - in folder name
    If there are more than one - in folder name our assumption of having part after
    as version breaks. A work arround is added to solve this

diff --git a/dh-make-font b/dh-make-font
index 560ec37..1daa743 100755
--- a/dh-make-font
+++ b/dh-make-font
@@ -96,16 +96,31 @@ def call_dh_make(args):
                   In case of any error dh_make will bark at you and not me :)
                     
                 """
-                if args.foldername.find('-'):
-                        args.foldername = args.foldername.replace('-','_')
-
                 folder = ""
-                if not args.foldername.startswith('fonts-'):
-                        args_string += " -p fonts-" + args.foldername
-                        folder = 'fonts-'+args.foldername
+                if args.foldername.count('-') > 1:
+                        """
+                          If we have more than one - in foldername that means foldername is in
+                          format folder-name-version. So lets split on - and join first 2 part
+                          again on - and join last part with the latter with _ in between
+
+                          #FIXME: Bad English?
+                          #FIXME: Any better way?
+                          
+                        """
+                        folder_split = args.foldername.split('-')
+                        folder = ('-').join(folder_split[:-1]) + '_' + folder_split[-1]
+                elif args.foldername.count('-') == 1:
+                        """
+                          If there is only one - we are happy :)
+                        """
+                        folder = args.foldername.replace('-','_')
+
+
+                if not folder.startswith('fonts-'):
+                        args_string += " -p fonts-" + folder
+                        folder = 'fonts-' + folder
                 else:
-                        args_string += " -p " + args.foldername
-                        folder = args.foldername
+                        args_string += " -p " + folder
                         
                 PACKAGE = folder.split('_')[0] if folder.find('_') else folder
                         

-- 
dh-make-font.git