dh-illumos (9.5.8) unstable; urgency=lowv9.5.8

  * Allow passing arbitrary options to tar in dh_illumos_gate

2 files changed, 21 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index d148b6a..b183daf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dh-illumos (9.5.8) unstable; urgency=low
+
+  * Allow passing arbitrary options to tar in dh_illumos_gate
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 27 Apr 2013 19:47:50 +0400
+
 dh-illumos (9.5.7) unstable; urgency=low
 
   * dh-illumos depends on onbld (for cw and aw)
diff --git a/dh_illumos_gate b/dh_illumos_gate
index 5efe85b..c4d2285 100755
--- a/dh_illumos_gate
+++ b/dh_illumos_gate
@@ -13,7 +13,7 @@ use Cwd;
 
 =head1 SYNOPSIS
 
-B<dh_illumos_gate> [S<I<debhelper options>>] [B<-B>] [B<-X>I<PATTERN>]
+B<dh_illumos_gate> [S<I<debhelper options>>] [B<-B>] [B<-X>I<PATTERN>] [-- [tar options]]
 [files and/or directories to extract]
 
 =head1 DESCRIPTION
@@ -79,6 +79,10 @@ then add F<usr/src/uts/common/sys/>
 
     dh_illumos_gate usr/src/Makefile\*
 
+=item Unpack all header files under F<usr/src/uts>
+
+    dh_illumos_gate -- --wildcards-match-slash usr/src/uts/*.h
+
 =back
 
 =head1 FILES
@@ -155,8 +159,16 @@ if (@ARGV) {
     push @to_extract, 'usr';
 }
 
-doit('tar', '-x', '-f', $tarball, @tar_X, '--wildcards', '--strip-components=1',
-    map {'illumos-gate/' . $_} @to_extract);
+my @to_extract_real = ();
+foreach my $p (@to_extract) {
+    if ($p =~ /^-/) {
+        push @to_extract_real, $p; #XXX: tar option
+    } else {
+        push @to_extract_real, 'illumos-gate/' . $p; #XXX: path
+    }
+}
+
+doit('tar', '-x', '-f', $tarball, @tar_X, '--wildcards', '--strip-components=1', @to_extract_real);
 
 =item Saving original files