[libhtml-tidy-perl] 02/10: d/patches: put all patches in the git style allowed by DEP-3, so they can be manipulated with gbp-pq

gregor herrmann gregoa at debian.org
Sat Jul 23 13:30:28 UTC 2016 

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libhtml-tidy-perl.

commit 447aa2e692a4276dc51c0e1d958c19f231c54279
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jul 22 09:46:18 2016 +0100

    d/patches: put all patches in the git style allowed by DEP-3, so they can be manipulated with gbp-pq
---
 debian/changelog                            |  2 +
 debian/patches/fix-error-message-in-webtidy | 13 +++--
 debian/patches/remove-tidy_version.patch    | 79 ++++++++++++++++++-----------
 debian/patches/tidy-not-tidyp.patch         | 19 +++++--
 4 files changed, 76 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0db8e1..2c0a999 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ libhtml-tidy-perl (1.56-2) UNRELEASED; urgency=medium
   * d/p/fix-error-message-in-webtidy: move to end of patch series.
     This is a firmly Debian-specific change that is not suitable for
     upstream.
+  * d/patches: put all patches in the git style allowed by DEP-3,
+    so they can be manipulated with gbp-pq
 
  -- gregor herrmann <gregoa at debian.org>  Thu, 27 Feb 2014 22:36:29 +0100
 
diff --git a/debian/patches/fix-error-message-in-webtidy b/debian/patches/fix-error-message-in-webtidy
index afdfb7c..0efb8d3 100644
--- a/debian/patches/fix-error-message-in-webtidy
+++ b/debian/patches/fix-error-message-in-webtidy
@@ -1,10 +1,17 @@
-Description: make webtidy error message more debianish
-Author: Ryan Niebur <ryan at debian.org>
+From: Ryan Niebur <ryan at debian.org>
+Date: Tue, 2 Jun 2009 21:15:36 -0700
+Subject: make webtidy error message more debianish
+
 Forwarded: not-needed
+---
+ bin/webtidy | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/bin/webtidy b/bin/webtidy
+index be57814..4a92423 100755
 --- a/bin/webtidy
 +++ b/bin/webtidy
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ for my $url ( @ARGV ) {
      my @lines;
      if ( $url =~ /^https?:/ ) {
          if ( !eval { require LWP::Simple; 1; } ) {
diff --git a/debian/patches/remove-tidy_version.patch b/debian/patches/remove-tidy_version.patch
index 6bbeffa..7b553f2 100644
--- a/debian/patches/remove-tidy_version.patch
+++ b/debian/patches/remove-tidy_version.patch
@@ -1,15 +1,26 @@
-Description: remove tidyVersion as it is a special call
- to Andy Lester's modified version of libtidy. Also remove
- the corresponding call from Perl, the documentation, and
- the tests.
-Author: gregor herrmann <gregoa at debian.org>
+From: gregor herrmann <gregoa at debian.org>
+Date: Sat, 20 Feb 2010 09:50:30 -0500
+Subject: remove tidyVersion
+
+It is a special call to Andy Lester's modified version of libtidy. Also
+remove the corresponding call from Perl, the documentation, and the tests.
+
 Reviewed-by: Jonathan Yu <jawnsy at cpan.org>
 Origin: vendor
 Forwarded: not-needed
+---
+ Tidy.xs          | 11 -----------
+ bin/webtidy      |  2 +-
+ lib/HTML/Tidy.pm | 17 -----------------
+ t/00-load.t      |  2 +-
+ t/version.t      |  5 +++++
+ 5 files changed, 7 insertions(+), 30 deletions(-)
 
+diff --git a/Tidy.xs b/Tidy.xs
+index 2238b0b..630b550 100644
 --- a/Tidy.xs
 +++ b/Tidy.xs
-@@ -189,14 +189,3 @@
+@@ -189,14 +189,3 @@ _tidy_clean(input, configfile, tidy_options)
          if ( rc < 0 ) {
              XSRETURN_UNDEF;
          }
@@ -24,24 +35,24 @@ Forwarded: not-needed
 -        RETVAL = newSVpv(version,0); /* will be automatically "mortalized" */
 -    OUTPUT:
 -        RETVAL
---- a/t/version.t
-+++ b/t/version.t
-@@ -7,7 +7,12 @@
- 
- use HTML::Tidy;
+diff --git a/bin/webtidy b/bin/webtidy
+index dc1a979..be57814 100755
+--- a/bin/webtidy
++++ b/bin/webtidy
+@@ -19,7 +19,7 @@ GetOptions(
+ ) or $help = 1;
  
-+SKIP: {
-+    skip 'libtidy_version has been removed in Debian', 4;
-+
- for my $version_string (HTML::Tidy->tidyp_version, HTML::Tidy->libtidyp_version) {
-     like( $version_string, qr/^\d\.\d{2,}$/, 'Valid version string' );
-     cmp_ok( $version_string, '>=', '0.90', 'Version is greater than 0.90, which is the one I maintain' );
+ if ( !@ARGV || $help ) {
+-    print "webtidy v$HTML::Tidy::VERSION using tidyp v" . HTML::Tidy::tidyp_version() . "\n";
++    print "webtidy v$HTML::Tidy::VERSION \n";
+     print <DATA>;
+     exit 1;
  }
-+
-+}
+diff --git a/lib/HTML/Tidy.pm b/lib/HTML/Tidy.pm
+index 32a5005..a172ea2 100644
 --- a/lib/HTML/Tidy.pm
 +++ b/lib/HTML/Tidy.pm
-@@ -341,23 +341,6 @@
+@@ -341,23 +341,6 @@ sub _is_keeper {
      return 1;
  }
  
@@ -65,23 +76,31 @@ Forwarded: not-needed
  require XSLoader;
  XSLoader::load('HTML::Tidy', $VERSION);
  
+diff --git a/t/00-load.t b/t/00-load.t
+index b40452d..d10902e 100644
 --- a/t/00-load.t
 +++ b/t/00-load.t
-@@ -8,5 +8,5 @@
+@@ -8,5 +8,5 @@ use Test::More tests => 1;
  use HTML::Tidy;
  use HTML::Tidy::Message;
  
 -diag( "Testing HTML::Tidy $HTML::Tidy::VERSION, Perl $]; tidyp " . HTML::Tidy->tidyp_version() );
 +diag( "Testing HTML::Tidy $HTML::Tidy::VERSION, Perl $];" );
  pass( 'Modules loaded' );
---- a/bin/webtidy
-+++ b/bin/webtidy
-@@ -19,7 +19,7 @@
- ) or $help = 1;
+diff --git a/t/version.t b/t/version.t
+index f225e3e..b05a7da 100644
+--- a/t/version.t
++++ b/t/version.t
+@@ -7,7 +7,12 @@ use Test::More tests => 4;
  
- if ( !@ARGV || $help ) {
--    print "webtidy v$HTML::Tidy::VERSION using tidyp v" . HTML::Tidy::tidyp_version() . "\n";
-+    print "webtidy v$HTML::Tidy::VERSION \n";
-     print <DATA>;
-     exit 1;
+ use HTML::Tidy;
+ 
++SKIP: {
++    skip 'libtidy_version has been removed in Debian', 4;
++
+ for my $version_string (HTML::Tidy->tidyp_version, HTML::Tidy->libtidyp_version) {
+     like( $version_string, qr/^\d\.\d{2,}$/, 'Valid version string' );
+     cmp_ok( $version_string, '>=', '0.90', 'Version is greater than 0.90, which is the one I maintain' );
  }
++
++}
diff --git a/debian/patches/tidy-not-tidyp.patch b/debian/patches/tidy-not-tidyp.patch
index 1b781cd..9875169 100644
--- a/debian/patches/tidy-not-tidyp.patch
+++ b/debian/patches/tidy-not-tidyp.patch
@@ -1,9 +1,18 @@
-Description: look for and use tidy.h in /usr/include/tidy (from libtidy-dev)
-Author: Florian Schlichting <fsfs at debian.org>
+From: Florian Schlichting <fsfs at debian.org>
+Date: Fri, 4 Oct 2013 23:39:39 +0200
+Subject: look for and use tidy.h in /usr/include/tidy (from libtidy-dev)
+
 Forwarded: not-needed
+---
+ Makefile.PL | 6 +++---
+ Tidy.xs     | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 1bca2ef..6ad1b7f 100644
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ use ExtUtils::Liblist;
  use Config;
  
  my $libs = '-ltidyp';
@@ -12,7 +21,7 @@ Forwarded: not-needed
  
  eval { require Alien::Tidyp; };
  
-@@ -20,8 +20,8 @@
+@@ -20,8 +20,8 @@ if ( !$@ ) {
      $inc = Alien::Tidyp->config('INC');
  }
  else {
@@ -23,6 +32,8 @@ Forwarded: not-needed
      $libs = $vars[2];
  
      if ( !$libs ) {
+diff --git a/Tidy.xs b/Tidy.xs
+index 630b550..a8bbe82 100644
 --- a/Tidy.xs
 +++ b/Tidy.xs
 @@ -2,7 +2,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libhtml-tidy-perl.git

More information about the Pkg-perl-cvs-commits mailing list