[SCM] groovebasin/master: use node-findit2 instead of node-findit

[andrewrk-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b547fa4f0cec9805267db87909ab258e152e0260
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Mon Oct 20 05:34:53 2014 +0000

    use node-findit2 instead of node-findit

diff --git a/debian/changelog b/debian/changelog
index f7e254c..35e59cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ groovebasin (1.4.0-1) UNRELEASED; urgency=medium
   * bundle human-size module
   * add additional dependencies from new release
   * copyright applies to post patch
-  * patch to use findit instead of findit2
+  * use node-findit2 instead of node-findit
 
  -- Andrew Kelley <superjoe30 at gmail.com>  Fri, 17 Oct 2014 06:03:40 +0000
 
diff --git a/debian/control b/debian/control
index 101f81b..3e9c751 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends:
  , node-content-disposition
  , node-cookies (>= 0.4.1)
  , node-express (>= 4.1.0)
- , node-findit (>= 2.0.0-2)
+ , node-findit2
  , node-groove (>= 2.2.6)
  , node-keese (>= 1.0.1)
  , node-lastfm (>= 0.9.2)
diff --git a/debian/patches/bundle-connect-static-module.patch b/debian/patches/bundle-connect-static-module.patch
index 7e43b6d..6daeebe 100644
--- a/debian/patches/bundle-connect-static-module.patch
+++ b/debian/patches/bundle-connect-static-module.patch
@@ -12,7 +12,7 @@ Forwarded: not-needed
 +var util = require('util');
 +var path = require('path');
 +var Pend = require('pend');
-+var findit = require('findit');
++var findit = require('findit2');
 +var mime = require('mime');
 +var url = require('url');
 +var StreamSink = require('streamsink');
diff --git a/debian/patches/findit2-alias.patch b/debian/patches/findit2-alias.patch
deleted file mode 100644
index 925d18b..0000000
--- a/debian/patches/findit2-alias.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: use findit instead of findit2
- In Debian, node-findit is the same as findit2 on NPM. This means upstream
- sources can be safely patched to require('findit') instead of
- require('findit2').
-Author: Andrew Kelley <superjoe30 at gmail.com>
-Forwarded: not-needed
---- groovebasin-1.4.0.orig/lib/player.js
-+++ groovebasin-1.4.0/lib/player.js
-@@ -8,7 +8,7 @@ var uuid = require('./uuid');
- var path = require('path');
- var Pend = require('pend');
- var DedupedQueue = require('./deduped_queue');
--var findit = require('findit2');
-+var findit = require('findit');
- var shuffle = require('mess');
- var mv = require('mv');
- var MusicLibraryIndex = require('music-library-index');
diff --git a/debian/patches/series b/debian/patches/series
index 47d1822..816ecdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ bundle-connect-static-module.patch
 bundle-curlydiff-module.patch
 bundle-mv-module.patch
 bundle-human-size-module.patch
-findit2-alias.patch

-- 
groovebasin packaging