[DRE-commits] [SCM] ruby-gd.git branch, master, updated. upstream/0.8.0-4-g8a3078f

Paul van Tilburg paulvt at debian.org
Sun Apr 22 16:41:40 UTC 2012


The following commit has been merged in the master branch:
commit 8a3078f88139214e6596f6eb900bc33f02bed555
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Sun Apr 22 18:26:02 2012 +0200

    Refreshed the patch so it can be used by quilt

diff --git a/debian/changelog b/debian/changelog
index 49e0581..703c5cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,11 +19,11 @@ ruby-gd (0.8.0-1) UNRELEASED; urgency=low
       convention the team is the default maintainer.
     - Added libgd-ruby and libgd-ruby1.8 as transitional packages.
   * debian/copyright: reworked to fit the copyright format 1.0.
+  * debian/patches: refreshed patches for use by quilt.
   * debian/ruby-gd.{docs,examples}: renamed from libgd-ruby.{docs,examples}.
-  * debian/patches: drop fix-set-interlace-on-amd64.patch as it is applied
-    upstream now.
+  * debian/source/options: set the "unapply-patches" option.
 
- -- Paul van Tilburg <paulvt at debian.org>  Sun, 22 Apr 2012 18:05:03 +0200
+ -- Paul van Tilburg <paulvt at debian.org>  Sun, 22 Apr 2012 18:24:36 +0200
 
 libgd-ruby (0.7.4.1-6.1) unstable; urgency=low
 
diff --git a/debian/patches/fix-set-interlace-on-amd64.patch b/debian/patches/fix-set-interlace-on-amd64.patch
new file mode 100644
index 0000000..f9617a2
--- /dev/null
+++ b/debian/patches/fix-set-interlace-on-amd64.patch
@@ -0,0 +1,12 @@
+Index: ruby-gd/GD.c
+===================================================================
+--- ruby-gd.orig/GD.c	2012-04-22 18:04:08.564097181 +0200
++++ ruby-gd/GD.c	2012-04-22 18:24:10.815561681 +0200
+@@ -1417,6 +1417,7 @@
+ 
+ static VALUE
+ img_set_interlace(img, val)
++    VALUE img, val;
+ {
+     gdImagePtr im;
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9186933
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-set-interlace-on-amd64.patch
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..76269ea
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-paches

-- 
ruby-gd.git



More information about the Pkg-ruby-extras-commits mailing list