[DRE-commits] [SCM] stompserver.git branch, master, updated. debian/0.9.9-1-2-ge9424a3

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit e9424a30b1f50b6e776ac813944876a794ed2a9d
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed May 16 16:34:36 2012 +0200

    Refreshed patches to remove fuzz; ignore the .pc directory

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/changelog b/debian/changelog
index 1672a50..dfb27b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,8 @@ stompserver (0.9.9-2) UNRELEASED; urgency=low
     - Switched the maintainer with the uploaders field as per new
       convention the team is the default maintainer.
   * debian/copyright: reworked to fit the Debian copyright format version 1.0.
-  * debiwn/watch: updated to use gemwatch instead Rubyforge.
+  * debian/watch: updated to use gemwatch instead Rubyforge.
+  * debian/patches: refreshed patches to removed fuzz.
 
  -- Paul van Tilburg <paulvt at debian.org>  Wed, 16 May 2012 16:11:56 +0200
 
diff --git a/debian/patches/fhs_paths.patch b/debian/patches/fhs_paths.patch
index 602ea6b..d026d26 100644
--- a/debian/patches/fhs_paths.patch
+++ b/debian/patches/fhs_paths.patch
@@ -1,11 +1,9 @@
 # Description: Check for absolute paths so we can enforce FHS in config.
 # No upstream patch/URL yet, will update package when one is open.
 # Author: Joshua Timberman <joshua at opscode.com>
-Index: stompserver-0.9.9/lib/stomp_server.rb
-===================================================================
---- stompserver-0.9.9.orig/lib/stomp_server.rb	2009-08-19 16:43:04.368066674 -0600
-+++ stompserver-0.9.9/lib/stomp_server.rb	2009-08-19 16:44:24.783974681 -0600
-@@ -28,6 +28,7 @@
+--- a/lib/stomp_server.rb
++++ b/lib/stomp_server.rb
+@@ -27,6 +27,7 @@
          :working_dir => Dir.getwd,
          :storage => ".stompserver",
          :logdir => 'log',
@@ -13,7 +11,7 @@ Index: stompserver-0.9.9/lib/stomp_server.rb
          :configfile => 'stompserver.conf',
          :logfile => 'stompserver.log',
          :pidfile => 'stompserver.pid',
-@@ -63,10 +63,10 @@
+@@ -62,11 +63,11 @@
          opts = @defaults
        end
  

-- 
stompserver.git