[DRE-commits] [SCM] ruby-mmap.git branch, master, updated. b973a68e7f33d28118d67dc556fc008bc6139811

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit b973a68e7f33d28118d67dc556fc008bc6139811
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Thu Apr 5 16:44:27 2012 +0200

    * debian/source/local-options: make sure patches are unapplied.
    * debian/patches:
      - Added fix_mmap_sofile_require.patch using quilt to make mmap.rb
        require the right file.

diff --git a/debian/changelog b/debian/changelog
index 3864fbb..00c955b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,10 +16,11 @@ ruby-mmap (0.2.6-4) UNRELEASED; urgency=low
     - Added libmmap-ruby and libdbus-ruby1.8 as transitional packages.
   * debian/copyright: reworked to fit the DEP5 format.
   * debian/patches:
-    - Added fix_mmap_sofile_require to make mmap.rb require the right
-      file.
+    - Added fix_mmap_sofile_require.patch using quilt to make mmap.rb
+      require the right file.
+  * debian/source/local-options: make sure patches are unapplied.
 
- -- Paul van Tilburg <paulvt at debian.org>  Wed, 28 Dec 2011 20:52:42 +0100
+ -- Paul van Tilburg <paulvt at debian.org>  Thu, 05 Apr 2012 16:39:35 +0200
 
 libmmap-ruby (0.2.6-3) unstable; urgency=low
 
diff --git a/debian/patches/fix_mmap_sofile_require b/debian/patches/fix_mmap_sofile_require.patch
similarity index 68%
rename from debian/patches/fix_mmap_sofile_require
rename to debian/patches/fix_mmap_sofile_require.patch
index 795ed18..84b2e96 100644
--- a/debian/patches/fix_mmap_sofile_require
+++ b/debian/patches/fix_mmap_sofile_require.patch
@@ -1,7 +1,7 @@
 Index: ruby-mmap/lib/mmap.rb
 ===================================================================
---- ruby-mmap.orig/lib/mmap.rb	2011-10-09 17:08:02.000000000 +0200
-+++ ruby-mmap/lib/mmap.rb	2011-12-28 20:51:56.000000000 +0100
+--- ruby-mmap.orig/lib/mmap.rb	2012-04-05 16:39:00.813170836 +0200
++++ ruby-mmap/lib/mmap.rb	2012-04-05 16:41:04.000000000 +0200
 @@ -4,7 +4,7 @@
  #
  # === WARNING
diff --git a/debian/patches/series b/debian/patches/series
index d51b28b..410c300 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix_mmap_sofile_require
+fix_mmap_sofile_require.patch
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches

-- 
ruby-mmap.git