Control: tags -1 + patch

Please consider the following fix, which also properly installs dh_doxygen 
as a Debhelper sequence addon so that it can be invoked via ‘dh $@ --with 
doxygen’.

Anders

diff -Nru doxygen-1.8.11/debian/changelog doxygen-1.8.11/debian/changelog
--- doxygen-1.8.11/debian/changelog     2016-06-24 10:22:04.000000000 -0400
+++ doxygen-1.8.11/debian/changelog     2016-09-04 05:06:57.000000000 -0400
@@ -1,3 +1,12 @@
+doxygen (1.8.11-4) UNRELEASED; urgency=medium
+
+  * dh_doxygen: Do not fail on packages with no doxygen documentation.
+    (Closes: #799543)
+  * Install dh_doxygen as a Debhelper sequence addon so that it can be
+    invoked via ‘dh $@ --with doxygen’.
+
+ -- Anders Kaseorg <ande...@mit.edu>  Sun, 04 Sep 2016 05:06:57 -0400
+
 doxygen (1.8.11-3) unstable; urgency=medium
 
   * Applied upstream commit 9a2c7bbfb0c53b4532db7280e6804c7ce76d70a3:
diff -Nru doxygen-1.8.11/debian/dh-doxygen/dh_doxygen 
doxygen-1.8.11/debian/dh-doxygen/dh_doxygen
--- doxygen-1.8.11/debian/dh-doxygen/dh_doxygen 2015-04-29 09:22:08.000000000 
-0400
+++ doxygen-1.8.11/debian/dh-doxygen/dh_doxygen 2016-09-04 05:06:57.000000000 
-0400
@@ -138,11 +138,9 @@
             }, $pkgpath);
         }
     }
-    if ($done == 0)
+    if (defined $path && $done == 0)
     {
-        my $message = 'Doxygen documentation not found';
-        $message .= " at $path" if defined $path;
-        error($message);
+        error("Doxygen documentation not found at $path");
     }
 }
 
diff -Nru doxygen-1.8.11/debian/doxygen.install 
doxygen-1.8.11/debian/doxygen.install
--- doxygen-1.8.11/debian/doxygen.install       2015-04-29 09:22:08.000000000 
-0400
+++ doxygen-1.8.11/debian/doxygen.install       2016-09-04 05:06:57.000000000 
-0400
@@ -1 +1,2 @@
 debian/dh-doxygen/dh_doxygen /usr/bin
+debian/dh-doxygen/doxygen.pm /usr/share/perl5/Debian/Debhelper/Sequence

Reply via email to