Commit cdc9264c authored by Craig Small's avatar Craig Small

Fixes to 2016.02

  * fix error with debian directory Thanks to Rytis for the patch
    Closes: #810581
  * Fixed bad substitutes
  * Make native package changelog have medium urgency too
parent 8a7ac0bf
dh-make (2.201603) UNRELEASED; urgency=medium
* fix error with debian directory Thanks to Rytis for the patch
Closes: #810581
* Fixed bad substitutes
* Make native package changelog have medium urgency too
-- Craig Small <csmall@debian.org> Sun, 10 Jan 2016 14:39:42 +1100
dh-make (2.201602) unstable; urgency=medium dh-make (2.201602) unstable; urgency=medium
[ Craig Small ] [ Craig Small ]
......
...@@ -13,7 +13,7 @@ from shutil import copy2 ...@@ -13,7 +13,7 @@ from shutil import copy2
from email.Utils import formatdate from email.Utils import formatdate
from enum import Enum from enum import Enum
__version__ = '2016.01' __version__ = '2016.03'
__dhlib__ = '/usr/share/debhelper/dh_make' __dhlib__ = '/usr/share/debhelper/dh_make'
policy_version = '3.9.6' policy_version = '3.9.6'
...@@ -26,10 +26,13 @@ def make_subs_func(subs_dict): ...@@ -26,10 +26,13 @@ def make_subs_func(subs_dict):
''' '''
Create a translation closure Create a translation closure
''' '''
rx = re.compile('|'.join(map(re.escape, subs_dict))) def prepare_key(k):
return re.escape('#'+k+'#')
rx = re.compile('|'.join(map(prepare_key, subs_dict)))
def one_xlat(match): def one_xlat(match):
return subs_dict[match.group(0)] return subs_dict[match.group(0).replace('#', '')]
def subs_func(text): def subs_func(text):
return rx.sub(one_xlat, text) return rx.sub(one_xlat, text)
...@@ -659,7 +662,7 @@ def setup_python(subs): ...@@ -659,7 +662,7 @@ def setup_python(subs):
docs/ build/man # Manpage generator docs/ build/man # Manpage generator
''' '''
subs['DH_ADDON'] += ' --with python2,python3'\ subs['DH_ADDON'] += ' --with python2,python3'\
'--buildsystem=pybuild' ' --buildsystem=pybuild'
subs['BUILD_DEPS'].extend(['dh-python', 'python-all (>= 2.6.6-3~)', subs['BUILD_DEPS'].extend(['dh-python', 'python-all (>= 2.6.6-3~)',
'python-setuptools', 'python3-all', 'python-setuptools', 'python3-all',
'python3-setuptools']) 'python3-setuptools'])
...@@ -730,7 +733,8 @@ def do_debianize(args, subs): ...@@ -730,7 +733,8 @@ def do_debianize(args, subs):
check_origtar(args.file, args.createorig, check_origtar(args.file, args.createorig,
subs['PACKAGE'], subs['VERSION']) subs['PACKAGE'], subs['VERSION'])
if args.python: if args.package_class == PackageClass.python:
print('pth')
setup_python(subs) setup_python(subs)
else: else:
subs['RULES_START_TEXT'] = ''' subs['RULES_START_TEXT'] = '''
...@@ -759,7 +763,7 @@ def do_debianize(args, subs): ...@@ -759,7 +763,7 @@ def do_debianize(args, subs):
setup_make() setup_make()
# Create debian directory # Create debian directory
if args.addmissing is None: if args.addmissing is False:
if os.path.isdir('debian'): if os.path.isdir('debian'):
print('You already have a debian/ subdirectory in the source' print('You already have a debian/ subdirectory in the source'
'tree.\ndh_make will not try to overwrite anything.') 'tree.\ndh_make will not try to overwrite anything.')
...@@ -809,7 +813,7 @@ def do_debianize(args, subs): ...@@ -809,7 +813,7 @@ def do_debianize(args, subs):
process_dir(args, subs_func, args.templates) process_dir(args, subs_func, args.templates)
process_docs(args.python, args.docs, subs['PACKAGE']) process_docs(args.python, args.docs, subs['PACKAGE'])
process_infos(args.docs, subs['PACKAGE']) process_infos(args.python, args.docs, subs['PACKAGE'])
rename_package_files(subs['PACKAGE']) rename_package_files(subs['PACKAGE'])
......
#PACKAGE# (#VERSION#) unstable; urgency=low #PACKAGE# (#VERSION#) unstable; urgency=medium
* Initial Release. * Initial Release.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment