Skip to content
This repository has been archived by the owner on Feb 23, 2021. It is now read-only.

Commit

Permalink
Fixed Debian bug #779196; updated generated standards-version
Browse files Browse the repository at this point in the history
  • Loading branch information
gwolf committed May 14, 2015
1 parent 6830471 commit 26d7e23
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
6 changes: 6 additions & 0 deletions changelog.txt
@@ -1,3 +1,9 @@
2.0 (2015-05-14)
* Fixed bug that caused an ugly error message instead of a proper one
when no licensing information is found. Thanks to Adi Kriegisch for
the fix!
* Upgraded generated Debian packages' standards-version to 3.9.6

1.9 (2015-03-28)
* Fixed bug in the version tables parsing; thanks to Matthew
Gabeler-Lee for providing the fix!
Expand Down
9 changes: 5 additions & 4 deletions dh-make-drupal
Expand Up @@ -5,10 +5,10 @@
#
# Creates Debian packages from Drupal projects (modules, themes, translations).

Version = '1.6'
Version = '2.0'
Author = 'Gunnar Wolf <gwolf@gwolf.org>'
Copyright = <<COPYRIGHT
Copyright © 2009-2013 Gunnar Wolf
Copyright © 2009-2015 Gunnar Wolf
Instituto de Investigaciones Económicas, UNAM
This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -327,7 +327,8 @@ module DrupalProject
# Canonically, Drupal modules include LICENSE.txt. Even more,
# canonically it is the GPLv2 - For further joy, it's usually
# one of two exact same files! :-)
if license = File.join(@instdir, find_license[0])
lic_file = find_license[0]
if (! lic_file.nil? and license = File.join(@instdir, lic_file))
data = File.read(license) || '' # Avoid an exception if file is missing
if ["998ed0c116c0cebfcd9b2107b0d82973",
"b234ee4d69f5fce4486a80fdaf4a4263"].include? Digest::MD5.hexdigest(data)
Expand Down Expand Up @@ -373,7 +374,7 @@ module DrupalProject
'Priority: extra',
'Maintainer: %s <%s>' % [@maint_name, @maint_mail],
'Build-Depends: debhelper (>= 8.0.0)',
'Standards-Version: 3.9.5',
'Standards-Version: 3.9.6',
'Homepage: %s' % @project.url,
'',
'Package: %s' % @pkgname,
Expand Down

0 comments on commit 26d7e23

Please sign in to comment.