From 52391df006868a6c782c0d1fb58bae097278b5d6 Mon Sep 17 00:00:00 2001
From: Luca Longinotti <l@longi.li>
Date: Sat, 15 Feb 2014 19:25:25 +0100
Subject: [PATCH] Swith C code to use org.libusb4java. Update references.

---
 pom.xml                    | 4 ++--
 src/main/c/README          | 6 +++---
 src/main/c/build/common.sh | 2 +-
 src/main/c/src/usb4java.h  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1a7eaa9..95f24c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,7 +195,7 @@
             <configuration>
               <classifier>no-natives</classifier>
               <excludes>
-                <exclude>org/usb4java/libusb/*-*/**</exclude>
+                <exclude>org/libusb4java/*-*/**</exclude>
               </excludes>
             </configuration>
           </execution>
@@ -206,7 +206,7 @@
             <configuration>
               <classifier>natives</classifier>
               <includes>
-                <include>org/usb4java/libusb/*-*/**</include>
+                <include>org/libusb4java/*-*/**</include>
               </includes>
             </configuration>
           </execution>
diff --git a/src/main/c/README b/src/main/c/README
index d942c8f..b8e539f 100644
--- a/src/main/c/README
+++ b/src/main/c/README
@@ -23,7 +23,7 @@ When compilation was successful then you can find the library in the
 number (Examples: libusb4java.so, libusb4java.dylib, libusb4java.dll).
 
 usb4java searches for the library in the CLASSPATH directory
-`org/usb4java/libusb/<OS>-<ARCH>/`. On a 32 bit x86 linux machine for
-example the directory name is `org/usb4java/libusb/linux-x86`. Usually
+`org/libusb4java/<OS>-<ARCH>/`. On a 32 bit x86 linux machine for
+example the directory name is `org/libusb4java/linux-x86`. Usually
 you can find the required name in the exception thrown by usb4java when it
-does not find the required library. 
+does not find the required library.
diff --git a/src/main/c/build/common.sh b/src/main/c/build/common.sh
index 0b0b758..125f66f 100644
--- a/src/main/c/build/common.sh
+++ b/src/main/c/build/common.sh
@@ -28,7 +28,7 @@ build()
         LIBUSB_URL="http://downloads.sf.net/project/libusb/libusb-1.0/$LIBUSB_NAME/$LIBUSB_ARCHIVE"
     fi
 
-    DISTDIR="$SRCDIR/../resources/org/usb4java/libusb/$OS-$ARCH"
+    DISTDIR="$SRCDIR/../resources/org/libusb4java/$OS-$ARCH"
 
     # Only Windows needs the shared library, the others want static ones.
     if [ "$OS" = "windows"  ]
diff --git a/src/main/c/src/usb4java.h b/src/main/c/src/usb4java.h
index 9e854be..f64d277 100644
--- a/src/main/c/src/usb4java.h
+++ b/src/main/c/src/usb4java.h
@@ -11,8 +11,8 @@
 #include <libusb.h>
 #include "config.h"
 
-#define PACKAGE_DIR "org/usb4java/libusb"
-#define METHOD_NAME(CLASS_NAME, METHOD_NAME) Java_org_usb4java_libusb_##CLASS_NAME##_##METHOD_NAME
+#define PACKAGE_DIR "org/libusb4java"
+#define METHOD_NAME(CLASS_NAME, METHOD_NAME) Java_org_libusb4java_##CLASS_NAME##_##METHOD_NAME
 
 #if SIZEOF_VOID_P == 4
 #  define jptr jint