[DRE-commits] r2779 - in packages/librmagick-ruby/trunk/debian: . patches

[lucas at alioth.debian.org]

Author: lucas
Date: 2008-06-12 10:46:26 +0000 (Thu, 12 Jun 2008)
New Revision: 2779

Added:
   packages/librmagick-ruby/trunk/debian/README.source
   packages/librmagick-ruby/trunk/debian/patches/series
Removed:
   packages/librmagick-ruby/trunk/debian/patches/00list
Modified:
   packages/librmagick-ruby/trunk/debian/changelog
   packages/librmagick-ruby/trunk/debian/control
   packages/librmagick-ruby/trunk/debian/patches/fail-on-doc-failure.dpatch
   packages/librmagick-ruby/trunk/debian/rules
Log:
prepare 2.5.0-1

Added: packages/librmagick-ruby/trunk/debian/README.source
===================================================================
--- packages/librmagick-ruby/trunk/debian/README.source	                        (rev 0)
+++ packages/librmagick-ruby/trunk/debian/README.source	2008-06-12 10:46:26 UTC (rev 2779)
@@ -0,0 +1 @@
+Uses quilt. See /usr/share/doc/quilt/README.source

Modified: packages/librmagick-ruby/trunk/debian/changelog
===================================================================
--- packages/librmagick-ruby/trunk/debian/changelog	2008-06-08 15:50:34 UTC (rev 2778)
+++ packages/librmagick-ruby/trunk/debian/changelog	2008-06-12 10:46:26 UTC (rev 2779)
@@ -1,8 +1,11 @@
-librmagick-ruby (2.4.0-2) UNRELEASED; urgency=low
+librmagick-ruby (2.5.0-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Conform to policy 3.8.0:
+    + add debian/README.source
+  * Switch to quilt to maintain patches.
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Wed, 04 Jun 2008 09:33:14 +0200
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Wed, 11 Jun 2008 23:52:45 +0200
 
 librmagick-ruby (2.4.0-1) unstable; urgency=low
 

Modified: packages/librmagick-ruby/trunk/debian/control
===================================================================
--- packages/librmagick-ruby/trunk/debian/control	2008-06-08 15:50:34 UTC (rev 2778)
+++ packages/librmagick-ruby/trunk/debian/control	2008-06-12 10:46:26 UTC (rev 2779)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Lucas Nussbaum <lucas at lucas-nussbaum.net>
-Build-Depends: debhelper (>= 5), libmagick9-dev (>= 7:6.3.7), ruby1.8, ruby1.8-dev, libwmf-bin, gs-gpl, gsfonts, cdbs (>= 0.4.33), ruby-pkg-tools (>= 0.13), rdoc, graphviz, dpatch, libsetup-ruby1.8 (>= 3.4.1-3)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5), libmagick9-dev (>= 7:6.3.7), ruby1.8, ruby1.8-dev, libwmf-bin, gs-gpl, gsfonts, cdbs (>= 0.4.33), ruby-pkg-tools (>= 0.13), rdoc, graphviz, quilt, libsetup-ruby1.8 (>= 3.4.1-3)
+Standards-Version: 3.8.0
 Homepage: http://rmagick.rubyforge.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/librmagick-ruby/trunk/
 Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/librmagick-ruby/trunk/

Deleted: packages/librmagick-ruby/trunk/debian/patches/00list
===================================================================
--- packages/librmagick-ruby/trunk/debian/patches/00list	2008-06-08 15:50:34 UTC (rev 2778)
+++ packages/librmagick-ruby/trunk/debian/patches/00list	2008-06-12 10:46:26 UTC (rev 2779)
@@ -1 +0,0 @@
-fail-on-doc-failure.dpatch

Modified: packages/librmagick-ruby/trunk/debian/patches/fail-on-doc-failure.dpatch
===================================================================
--- packages/librmagick-ruby/trunk/debian/patches/fail-on-doc-failure.dpatch	2008-06-08 15:50:34 UTC (rev 2778)
+++ packages/librmagick-ruby/trunk/debian/patches/fail-on-doc-failure.dpatch	2008-06-12 10:46:26 UTC (rev 2779)
@@ -6,15 +6,14 @@
 ## DP: failures.
 
 @DPATCH@
-diff -urNad librmagick-ruby-1.11.0~/post-setup.rb librmagick-ruby-1.11.0/post-setup.rb
---- librmagick-ruby-1.11.0~/post-setup.rb	2006-04-27 00:27:41.000000000 +0200
-+++ librmagick-ruby-1.11.0/post-setup.rb	2006-05-22 09:43:15.000000000 +0200
-@@ -84,7 +84,7 @@
+--- a/post-setup.rb
++++ b/post-setup.rb
+@@ -84,7 +84,7 @@ class ExampleSet
      if $? != 0 then
        puts("post-setup.rb: #{example} example returned error code #{$?}")
        @errs += 1 unless ALLOW_EXAMPLE_ERRORS
 -      if @errs > 4
 +      if @errs > 1
           err(<<-END_EXFAIL
-             Too many examples failed. The RMagick documentation cannot be installed
-             successfully. Consult the README.txt file and try again, or send email
+             Too many examples failed. Search for "Help!" at
+             http://rmagick.rubyforge.org/install-faq.html.

Added: packages/librmagick-ruby/trunk/debian/patches/series
===================================================================
--- packages/librmagick-ruby/trunk/debian/patches/series	                        (rev 0)
+++ packages/librmagick-ruby/trunk/debian/patches/series	2008-06-12 10:46:26 UTC (rev 2779)
@@ -0,0 +1 @@
+fail-on-doc-failure.dpatch

Modified: packages/librmagick-ruby/trunk/debian/rules
===================================================================
--- packages/librmagick-ruby/trunk/debian/rules	2008-06-08 15:50:34 UTC (rev 2778)
+++ packages/librmagick-ruby/trunk/debian/rules	2008-06-12 10:46:26 UTC (rev 2779)
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 
 docdir := /usr/share/doc/librmagick-ruby-doc/html