From b62b668d1af61775eb8254df07f6b8d59ef4e58f Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Tue, 27 Sep 2011 17:53:25 +0000
Subject: [PATCH] Debian: rework j(cpuid|bigi) patches

Patch reworking needed due to my recent edits to the jcpuid/jbigi scripts
---
 debian/patches/0002-jbigi-soname.patch    |  4 ++--
 debian/patches/0003-renaming-jcpuid.patch | 29 ++++++++---------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/debian/patches/0002-jbigi-soname.patch b/debian/patches/0002-jbigi-soname.patch
index a361317fd..71a54faba 100644
--- a/debian/patches/0002-jbigi-soname.patch
+++ b/debian/patches/0002-jbigi-soname.patch
@@ -12,7 +12,7 @@ a soname to shut lintian up.
 
 --- a/core/c/jbigi/mbuild_jbigi.sh
 +++ b/core/c/jbigi/mbuild_jbigi.sh
-@@ -47,7 +47,7 @@
+@@ -48,7 +48,7 @@
  		fi
          fi
          COMPILEFLAGS="-fPIC -Wall"
@@ -21,7 +21,7 @@ a soname to shut lintian up.
          LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
          LIBFILE="libjbigi.so";;
  *)
-@@ -66,7 +66,7 @@
+@@ -67,7 +67,7 @@
  
  echo "Compiling C code..."
  rm -f jbigi.o $LIBFILE
diff --git a/debian/patches/0003-renaming-jcpuid.patch b/debian/patches/0003-renaming-jcpuid.patch
index 9053c14c9..0b5250a4c 100644
--- a/debian/patches/0003-renaming-jcpuid.patch
+++ b/debian/patches/0003-renaming-jcpuid.patch
@@ -8,23 +8,14 @@ Subject: rename jcpuid
 
 --- a/core/c/jcpuid/build.sh
 +++ b/core/c/jcpuid/build.sh
-@@ -37,7 +37,7 @@
-         COMPILEFLAGS="-Wall"
-         INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/solaris/"
-         LINKFLAGS="-shared -static -Wl,-soname,libjcpuid-x86-solaris.so"
--        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-solaris.so";;
-+        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid.so";;
- FreeBSD*)
- 	COMPILEFLAGS="-Wall"
- 	INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/freebsd/"
-@@ -46,8 +46,8 @@
- *kFreeBSD*|Linux*)
- 	COMPILEFLAGS="-fPIC -Wall"
- 	INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
--	LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-linux.so"
--	LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so";;
-+	LINKFLAGS="-shared -Wl,-soname,libjcpuid.so"
-+	LIBFILE="../jbigi/libjcpuid.so";;
+@@ -83,8 +83,8 @@
+             echo "and/or set JAVA_HOME then re-run this script."
+             exit 1
+         fi
+-        LINKFLAGS="-shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
+-        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-${UNIXTYPE}.so"
++        LINKFLAGS="-shared -Wl,-soname,libjcpuid.so"
++        LIBFILE="../jbigi/libjcpuid.so"
+         COMPILEFLAGS="-fPIC -Wall"
+         INCLUDES="-I. -Iinclude -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${UNIXTYPE}";;
  esac
- 
- echo "Compiling C code..."