This patch contains the differences between the upstream tarball and
the sources actually used for building the package.

Option single-debian-patch is used as the changes are tracked in git.
--- jzmq-3.1.0.orig/config/ax_jni_include_dir.m4
+++ jzmq-3.1.0/config/ax_jni_include_dir.m4
@@ -85,7 +85,7 @@ fi
 # get the likely subdirectories for system specific java includes
 case "$host_os" in
 bsdi*)          _JNI_INC_SUBDIRS="bsdos";;
-linux*)         _JNI_INC_SUBDIRS="linux genunix";;
+linux*|*gnu)	_JNI_INC_SUBDIRS="linux genunix";;
 darwin*)         _JNI_INC_SUBDIRS="darwin";;
 osf*)           _JNI_INC_SUBDIRS="alpha";;
 solaris*)       _JNI_INC_SUBDIRS="solaris";;
--- jzmq-3.1.0.orig/configure.in
+++ jzmq-3.1.0/configure.in
@@ -93,10 +93,7 @@ AC_CHECK_LIB([zmq], [zmq_init],
 test "x$JAVAC" = x && AC_CHECK_PROGS(JAVAC, javac -encoding ut8)
 test "x$JAVAC" = x && AC_MSG_ERROR([cannot find javac])
 AC_SUBST(JAVAC)
-
-test "x$JAVAH" = x && AC_CHECK_PROGS(JAVAH, javah)
-test "x$JAVAH" = x && AC_MSG_ERROR([cannot find javah])
-AC_SUBST(JAVAH)
+AC_SUBST(JAVACFLAGS)
 
 test "x$JAR" = x && AC_CHECK_PROGS(JAR, jar)
 test "x$JAR" = x && AC_MSG_ERROR([cannot find jar])
--- jzmq-3.1.0.orig/pom.xml
+++ jzmq-3.1.0/pom.xml
@@ -42,8 +42,8 @@
   </developers>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.6</maven.compiler.source>
-    <maven.compiler.target>1.6</maven.compiler.target>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
     <maven-assembly-plugin.version>2.3</maven-assembly-plugin.version>
     <maven-buildnumber-plugin.version>1.0</maven-buildnumber-plugin.version>
     <maven-deploy-plugin.version>2.6</maven-deploy-plugin.version>
--- jzmq-3.1.0.orig/src/main/c++/Event.cpp
+++ jzmq-3.1.0/src/main/c++/Event.cpp
@@ -2,6 +2,7 @@
 #include <zmq.h>
 #include <cstdlib>
 #include <cstring>
+#include <zmq.hpp>
 
 #include "jzmq.hpp"
 #include "util.hpp"
--- jzmq-3.1.0.orig/src/main/c++/Makefile.am
+++ jzmq-3.1.0/src/main/c++/Makefile.am
@@ -39,7 +39,7 @@ JZMQ_HPP_FILES = \
 JZMQ_CLASS_FILES = org/zeromq/*.class
 
 $(jarfile):
-	$(JAVAC) -d . $(JZMQ_JAVA_FILES)
+	$(JAVAC) $(JAVACFLAGS) -d . -h . $(JZMQ_JAVA_FILES)
 	$(JAR) cf $(JARFLAGS) $@ $(JZMQ_CLASS_FILES)
 
 jar_DATA = $(jarfile)
@@ -72,7 +72,6 @@ CLEANFILES = \
 
 
 $(JZMQ_H_FILES): $(jarfile)
-	$(CLASSPATH_ENV) $(JAVAH) -jni -classpath . org.zeromq.ZMQ
 
 $(srcdir)/ZMQ.cpp: \
 	$(JZMQ_H_FILES) \
--- jzmq-3.1.0.orig/src/main/perf/Makefile.am
+++ jzmq-3.1.0/src/main/perf/Makefile.am
@@ -11,7 +11,7 @@ JZMQ_PERF_JAVA_FILES = \
 JZMQ_PERF_CLASS_FILES = *.class
 
 $(jarfile): 
-	$(JAVAC) -classpath $(top_builddir)/src/main/java -d . $(JZMQ_PERF_JAVA_FILES)
+	$(JAVAC) $(JAVACFLAGS) -classpath $(top_builddir)/src/main/java -d . $(JZMQ_PERF_JAVA_FILES)
 	$(JAR) cf $(JARFLAGS) $@ $(JZMQ_PERF_CLASS_FILES)
 
 jar_DATA = $(jarfile)
