[DRE-commits] [SCM] syncache.git branch, master, updated. upstream/1.0-10-g0050b61

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit 0f3ad15b377faae099843ef66888b000f5df3d50
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Tue Sep 27 01:40:40 2011 +0300

    update changelog and watch; drop patch merged upstream

diff --git a/debian/changelog b/debian/changelog
index abfd647..5c7f421 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+syncache (1.1-1) unstable; urgency=low
+
+  * New upstream version:
+    - Ruby 1.9 compatibility patch merged upstream
+    - new RemoteCache wrapper class.
+  * Point debian/watch at GitHub.
+  * Use --retry when stopping syncache-drb.
+  * Move piddir creation from postinst to init script.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Tue, 27 Sep 2011 01:33:27 +0300
+
 syncache (1.0-1) unstable; urgency=low
 
   * Initial release. Closes: #573966 (ITP).
diff --git a/debian/patches/0001-apply-sync.rb-monkey-patch-on-ruby-above-1.9.0-too.patch b/debian/patches/0001-apply-sync.rb-monkey-patch-on-ruby-above-1.9.0-too.patch
deleted file mode 100644
index 5ce4b3f..0000000
--- a/debian/patches/0001-apply-sync.rb-monkey-patch-on-ruby-above-1.9.0-too.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Dmitry Borodaenko <angdraug at debian.org>
-Date: Wed, 14 Sep 2011 14:15:04 +0300
-Subject: apply sync.rb monkey patch on ruby above 1.9.0, too
-
-The same bug is still there in Ruby 1.9.2p290, and the monkey patch has
-to be more agressive to really stick.
----
- lib/syncache_sync_patch.rb |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/lib/syncache_sync_patch.rb b/lib/syncache_sync_patch.rb
-index df9d9b1..29524d5 100644
---- a/lib/syncache_sync_patch.rb
-+++ b/lib/syncache_sync_patch.rb
-@@ -20,7 +20,7 @@ module Sync_m
-   end
- end
- 
--elsif RUBY_VERSION == "1.9.0"
-+elsif RUBY_VERSION >= "1.9.0"
- 
- module Sync_m
-   def sync_try_lock(mode = EX)
-@@ -33,4 +33,10 @@ module Sync_m
-   end
- end
- 
-+class Sync_c
-+  include Sync_m
-+end
-+
-+Synchronizer = Sync = Sync_c
-+
- end
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 3036e1f..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-apply-sync.rb-monkey-patch-on-ruby-above-1.9.0-too.patch
diff --git a/debian/watch b/debian/watch
index 12b28bd..dbbf0f9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://savannah.nongnu.org/download/samizdat syncache-([\d\.]*).tar.gz
+https://github.com/angdraug/syncache/downloads .*/syncache/tarball/v([\d\.]*)

-- 
syncache.git