Bug#700872: unblock: dh-make-drupal/1.3-1

[Gunnar Wolf <gwolf@gwolf.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package dh-make-drupal

I received a bug report/pull request via GitHub¹ explaining that
drupal.org no longer serves requests lacking a User-Agent string. This
version fixes that problem and adds more descriptive error reporting,
and a very simple modification allowing it to be run in Squeeze
systems (debhelper >> 8.0.0 to >= 8.0.0).

¹ https://github.com/gwolf/dh-make-drupal/pull/2

Full diff between 1.2-1 and 1.3-1 follows.

diff --git a/changelog.txt b/changelog.txt
index 017964c..7294924 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+1.3 (2013-02-18)
+ * Thanks to Stefan Kangas - This release is basically a pull request
+   of his work (https://github.com/gwolf/dh-make-drupal/pull/2)
+ * Provide a User-Agent to keep working despite drupal.org's new
+   restrictions
+ * Show the OpenURI::HTTPError exception reasons
+ * Fix the generated Build-Depends to work correctly on Squeeze
+
 1.2 (2012-08-13)
  * "Switch '-d' (Drupal version) was not accepting its needed argument.
    Fixed, thanks  to Matthew Gabeler-Lee for the report
diff --git a/debian/changelog b/debian/changelog
index 66b44c7..dc3f979 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+dh-make-drupal (1.3-1) unstable; urgency=low
+
+  * Merging Stefan Kangas' pull request - Thanks!
+  * Provide a User-Agent to keep working despite drupal.org's new
+    restrictions
+  * Show the OpenURI::HTTPError exception reasons
+  * Fix the generated Build-Depends to work correctly on Squeeze
+
+ -- Gunnar Wolf <gwolf@debian.org>  Mon, 18 Feb 2013 12:07:02 -0600
+
 dh-make-drupal (1.2-1) unstable; urgency=low
 
   * Switch '-d' (Drupal version) was not accepting its needed argument -
diff --git a/dh-make-drupal b/dh-make-drupal
index b011b18..650e967 100755
--- a/dh-make-drupal
+++ b/dh-make-drupal
@@ -5,7 +5,7 @@
 #
 # Creates Debian packages from Drupal projects (modules, themes, translations).
 
-Version = '1.0'
+Version = '1.3'
 Author = 'Gunnar Wolf <gwolf@gwolf.org>'
 Copyright = <<COPYRIGHT
 Copyright © 2009-2012 Gunnar Wolf
@@ -371,7 +371,7 @@ module DrupalProject
                  'Section: web',
                  'Priority: extra',
                  'Maintainer: %s <%s>' % [@maint_name, @maint_mail],
-                 'Build-Depends: debhelper (>> 8.0.0)',
+                 'Build-Depends: debhelper (>= 8.0.0)',
                  'Standards-Version: 3.9.3',
                  'Homepage: %s' % @project.url,
                  '',
@@ -648,9 +648,9 @@ module DrupalProject
       auth = self.new
 
       begin
-        doc = Hpricot(open(url))
+        doc = Hpricot(open(url, 'User-Agent' => "dh-make-drupal %s" % [Version]))
       rescue OpenURI::HTTPError
-        raise IOError, "Could not open author information site at #{url}"
+        raise IOError, "Could not open author information site at #{url}: " + $!
       end
       auth.info_url = url
       auth.name = doc.search('dd.profile-profile_full_name').inner_text
@@ -671,9 +671,9 @@ module DrupalProject
       Logger.instance.debug "Fetching project information from #{@url}"
 
       begin
-        @html = Hpricot(open(@url))
+        @html = Hpricot(open(@url, 'User-Agent' => "dh-make-drupal %s" % [Version]))
       rescue OpenURI::HTTPError
-        raise IOError, "Could not open #{name} project website at #{@url}"
+        raise IOError, "Could not open #{name} project website at #{@url}: " + $!
       end
 
       # Get the project description. Fetch only the first paragraph -
@@ -883,9 +883,10 @@ module DrupalProject
           raise Errno::EEXIST, "Destination filename for source tarball "+
             "(#{dest_file}) already exists. Cannot continue."
         end
-        File.open(dest_file, 'w') {|f| f.write open(url).read}
+        File.open(dest_file, 'w') {|f|
+          f.write open(url, 'User-Agent' => "dh-make-drupal %s" % [Version]).read}
       rescue OpenURI::HTTPError
-        Logger.instance.error "Requested URI #{url} could not be retreived"
+        Logger.instance.error "Requested URI #{url} could not be retreived: " + $!
       end
     end
 


unblock dh-make-drupal/1.3-1

-- System Information:
Debian Release: 7.0
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash