Hi,
I have just uploaded dh-make-drupal 0.7-1 - It is a very minor change
from previous version (0.6-2), adding two very simple patches for
reliability, and pushing up standards-version (both for the package
itself and for the packages it generates) from 3.8.4 to
3.9.1.0. Please unblock so it can enter Squeeze.
FWIW, the full diff is inlined here, just to show the exents of the
changes are _very_ simple.
diff --git a/changelog.txt b/changelog.txt
index b9771b3..5c3bdb7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+0.7 (2010-08-25)
+ * Avoid dying with an exception if LICENSE.txt does not exist (thanks
+ to Roel de Cock for the report)
+ * No longer chokes on needlesly quoted dependencies
+ * Updated generated standards-version to 3.9.1.0
+
0.6 - 2010-04-15
* Updated generated standards-version to 3.8.4
* Builds a list of recommended modules/packages out of the
diff --git a/debian/changelog b/debian/changelog
index c6a1687..6673bfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dh-make-drupal (0.7-1) unstable; urgency=low
+
+ * New upstream release
+ * Both package's and generated standards-version 3.8.4→3.9.1.0 (no
+ changes needed)
+ * No longer chokes on needlessly quoted dependencies (Closes: #594337)
+
+ -- Gunnar Wolf <gwolf@debian.org> Wed, 25 Aug 2010 13:37:35 -0500
+
dh-make-drupal (0.6-2) unstable; urgency=low
* Added missing dependencies to build packages (debhelper, build-
diff --git a/debian/control b/debian/control
index 67bc600..b3ab162 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: extra
Maintainer: Gunnar Wolf <gwolf@debian.org>
Build-Depends: debhelper (>= 7.0.50), help2man, ruby, libruby, libcommandline-ruby, libhpricot-ruby
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1.0
Homepage: http://www.github.com/gwolf/dh-make-drupal
Vcs-Git: git://github.com/gwolf/dh-make-drupal.git
Vcs-Browser: http://www.github.com/gwolf/dh-make-drupal
diff --git a/dh-make-drupal b/dh-make-drupal
index f8df0d5..1167793 100755
--- a/dh-make-drupal
+++ b/dh-make-drupal
@@ -451,7 +451,7 @@ module DrupalProject
# canonically it is the GPLv2 - For further joy, it's usually
# the exact same file! :-)
if license = File.join(@instdir, find_license[0])
- data = File.read(license)
+ data = File.read(license) || '' # Avoid an exception if file is missing
if Digest::MD5.hexdigest(data) == "998ed0c116c0cebfcd9b2107b0d82973"
res << 'This package is licensed under the GNU General Public ' <<
'License (GPL) version 2.' << '' <<
@@ -490,7 +490,7 @@ module DrupalProject
'Priority: extra',
'Maintainer: %s <%s>' % [@maint_name, @maint_mail],
'Build-Depends: debhelper (>> 5.0.0)',
- 'Standards-Version: 3.8.4',
+ 'Standards-Version: 3.9.1.0',
'Homepage: %s' % @project.url,
'',
'Package: %s' % @pkgname,
@@ -697,7 +697,12 @@ module DrupalProject
begin
raise Irrelevant unless line and
line =~ /dependencies\[.*\]\s*=\s*(.*)\n?/
- dep = $1
+ # Some modules add what we would regard to as garbage to the
+ # dependencies - Unneeded quoting is the most bothering
+ # example. So, clean up the dependency, leaving only
+ # alphanumeric and hyphens. Oh, and underscores are converted
+ # to hyphens while we are at it.
+ dep = $1.gsub(/[^a-zA-Z0-9_-]/,'').gsub(/_/, '-')
begin
if CoreDrupalModules[@d_ver].include?(dep)
Logger.instance.debug(('Declared dependency %s is part of ' +
Attachment:
signature.asc
Description: Digital signature