version 2.1-5

4 files changed, 27 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 59137319dc8c..8026cdeb0317 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = btscanner
 	pkgdesc = Bluetooth device scanner.
 	pkgver = 2.1
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.pentest.co.uk
 	changelog = btscanner.changelog
 	arch = i686
@@ -12,7 +12,7 @@ pkgbase = btscanner
 	source = http://www.pentest.co.uk/src/btscanner-2.1.tar.bz2
 	source = btscanner.patch
 	md5sums = 587ec5847647d432eac1704b260af020
-	md5sums = c1e3d85b9a01f941a111ccf747389def
+	md5sums = 606530db564f269ce245997e30f9fe86
 
 pkgname = btscanner
 
diff --git a/PKGBUILD b/PKGBUILD
index 58649edb7ede..dc85681288ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=btscanner
 pkgver=2.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Bluetooth device scanner."
 url="http://www.pentest.co.uk"
 depends=('bluez-libs' 'libxml2')
@@ -13,7 +13,7 @@ changelog=$pkgname.changelog
 source=(http://www.pentest.co.uk/src/$pkgname-$pkgver.tar.bz2
        $pkgname.patch)
 md5sums=('587ec5847647d432eac1704b260af020'
-         '0b552988bffa2a843e2c52eb5f3a2f7c')
+         '606530db564f269ce245997e30f9fe86')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -35,5 +35,3 @@ package() {
   install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README"
   install -Dm644 USAGE  "${pkgdir}/usr/share/doc/${pkgname}/USAGE"
 }
-md5sums=('587ec5847647d432eac1704b260af020'
-         'c1e3d85b9a01f941a111ccf747389def')
diff --git a/btscanner.changelog b/btscanner.changelog
index a1731585414b..31aa9bc1eb61 100644
--- a/btscanner.changelog
+++ b/btscanner.changelog
@@ -1,3 +1,8 @@
+2015-09-24 Brian Bidulock <bidulock@openss7.org>
+
+	* 2.1-5:
+	corrected paths in btscanner.xml
+
 2014-08-01 Brian Bidulock <bidulock@openss7.org>
 
 	* 2.1-4:
diff --git a/btscanner.patch b/btscanner.patch
index 71a8efeac5ec..3ba264496720 100644
--- a/btscanner.patch
+++ b/btscanner.patch
@@ -1,6 +1,21 @@
+diff -up btscanner-2.1/btscanner.xml.orig btscanner-2.1/btscanner.xml
+--- btscanner-2.1/btscanner.xml.orig	2004-11-01 04:56:41.000000000 -0700
++++ btscanner-2.1/btscanner.xml	2015-09-23 19:47:46.000000000 -0600
+@@ -1,9 +1,9 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE btscanner SYSTEM "file:///usr/local/etc/btscanner.dtd">
++<!DOCTYPE btscanner SYSTEM "file:///etc/btscanner/btscanner.dtd">
+ <btscanner>
+ <files>
+ 	<log>btscanner.log</log>
+-	<oui>/usr/local/share/oui.txt</oui>
++	<oui>/usr/share/btscanner/oui.txt</oui>
+ 	<store>~/bts</store>
+ </files>
+ 
 diff -up btscanner-2.1/configure.in.orig btscanner-2.1/configure.in
 --- btscanner-2.1/configure.in.orig	2005-11-21 06:56:56.000000000 -0700
-+++ btscanner-2.1/configure.in	2014-08-01 05:20:15.000000000 -0600
++++ btscanner-2.1/configure.in	2015-09-23 19:52:57.000000000 -0600
 @@ -62,15 +62,6 @@ AC_CHECK_HEADERS([libxml/parser.h libxml
    [AC_MSG_ERROR([libxml2 headers MIA])])
  AC_HAVE_LIBRARY(xml2,,[AC_MSG_ERROR([libxml2 not found])])
@@ -28,7 +43,7 @@ diff -up btscanner-2.1/configure.in.orig btscanner-2.1/configure.in
  AC_CONFIG_FILES([Makefile])
 diff -up btscanner-2.1/Makefile.am.orig btscanner-2.1/Makefile.am
 --- btscanner-2.1/Makefile.am.orig	2004-11-01 04:55:33.000000000 -0700
-+++ btscanner-2.1/Makefile.am	2014-08-01 05:21:11.000000000 -0600
++++ btscanner-2.1/Makefile.am	2015-09-23 19:46:10.000000000 -0600
 @@ -23,7 +23,8 @@
  
  bin_PROGRAMS = btscanner
@@ -41,7 +56,7 @@ diff -up btscanner-2.1/Makefile.am.orig btscanner-2.1/Makefile.am
  	threader.c threader.h \
 diff -up btscanner-2.1/screen.c.orig btscanner-2.1/screen.c
 --- btscanner-2.1/screen.c.orig	2005-08-17 15:15:59.000000000 -0600
-+++ btscanner-2.1/screen.c	2014-08-01 05:20:15.000000000 -0600
++++ btscanner-2.1/screen.c	2015-09-23 19:46:10.000000000 -0600
 @@ -985,9 +985,9 @@ int screen_init_bf(void)
  	bdaddr_t start, end;