Fixed #3447520 Debian package: fix location for JAR file

diff --git a/Makefile b/Makefile
index da5da70..1d49224 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i486-pc-linux-gnu
-host_triplet = i486-pc-linux-gnu
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(top_srcdir)/configure ABOUT-NLS \
@@ -120,7 +120,7 @@ JAVAC = /usr/bin/javac
 JAVAH = /usr/bin/javah
 JAVA_HOME = /usr
 LD = /usr/bin/ld
-LDFLAGS = -Wl,-z,defs
+LDFLAGS = 
 LIBICONV = -liconv
 LIBINTL = 
 LIBOBJS = 
@@ -177,9 +177,9 @@ am__quote =
 am__tar = tar --format=posix -chf - "$$tardir"
 am__untar = tar -xf -
 bindir = ${exec_prefix}/bin
-build = i486-pc-linux-gnu
-build_alias = i486-linux-gnu
-build_cpu = i486
+build = i686-pc-linux-gnu
+build_alias = 
+build_cpu = i686
 build_os = linux-gnu
 build_vendor = pc
 builddir = .
@@ -188,24 +188,24 @@ datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i486-pc-linux-gnu
+host = i686-pc-linux-gnu
 host_alias = 
-host_cpu = i486
+host_cpu = i686
 host_os = linux-gnu
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
-infodir = ${prefix}/share/info
+infodir = ${datarootdir}/info
 install_sh = $(SHELL) /home/sylvain/Devs/sudokukiTrunk/sudokuki/build-aux/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
-mandir = ${prefix}/share/man
+mandir = ${datarootdir}/man
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
+prefix = /usr/local
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin

diff --git a/libtool b/libtool
index 0178418..e98b7e7 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -63,12 +63,12 @@ ECHO="printf %s\\n"
 
 # The host system.
 host_alias=
-host=i486-pc-linux-gnu
+host=i686-pc-linux-gnu
 host_os=linux-gnu
 
 # The build system.
-build_alias=i486-linux-gnu
-build=i486-pc-linux-gnu
+build_alias=
+build=i686-pc-linux-gnu
 build_os=linux-gnu
 
 # A sed program that does not truncate output.

diff --git a/po/Makefile b/po/Makefile
index 582eb4c..3a3a9e1 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -22,7 +22,7 @@ srcdir = .
 top_srcdir = ..
 
 
-prefix = /usr
+prefix = /usr/local
 exec_prefix = ${prefix}
 datarootdir = ${prefix}/share
 datadir = ${datarootdir}

diff --git a/po/Makefile.in b/po/Makefile.in
index ac23982..7c88e8d 100644 (file)
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -22,7 +22,7 @@ srcdir = .
 top_srcdir = ..
 
 
-prefix = /usr
+prefix = /usr/local
 exec_prefix = ${prefix}
 datarootdir = ${prefix}/share
 datadir = ${datarootdir}

diff --git a/src/Makefile b/src/Makefile
index 5780d42..6a739b6 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -31,8 +31,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i486-pc-linux-gnu
-host_triplet = i486-pc-linux-gnu
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -133,7 +133,7 @@ JAVAC = /usr/bin/javac
 JAVAH = /usr/bin/javah
 JAVA_HOME = /usr
 LD = /usr/bin/ld
-LDFLAGS = -Wl,-z,defs
+LDFLAGS = 
 LIBICONV = -liconv
 LIBINTL = 
 LIBOBJS = 
@@ -190,9 +190,9 @@ am__quote =
 am__tar = tar --format=posix -chf - "$$tardir"
 am__untar = tar -xf -
 bindir = ${exec_prefix}/bin
-build = i486-pc-linux-gnu
-build_alias = i486-linux-gnu
-build_cpu = i486
+build = i686-pc-linux-gnu
+build_alias = 
+build_cpu = i686
 build_os = linux-gnu
 build_vendor = pc
 builddir = .
@@ -201,24 +201,24 @@ datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i486-pc-linux-gnu
+host = i686-pc-linux-gnu
 host_alias = 
-host_cpu = i486
+host_cpu = i686
 host_os = linux-gnu
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
-infodir = ${prefix}/share/info
+infodir = ${datarootdir}/info
 install_sh = $(SHELL) /home/sylvain/Devs/sudokukiTrunk/sudokuki/build-aux/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
-mandir = ${prefix}/share/man
+mandir = ${datarootdir}/man
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
+prefix = /usr/local
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
@@ -660,7 +660,7 @@ uninstall-am: uninstall-binSCRIPTS uninstall-libLTLIBRARIES
 
 sudokuki:
        echo "#!/bin/sh" > $@ ; \
-       echo "java -Djava.library.path=\"$(libdir)\" -jar $(datadir)/java/$(PACKAGE)-$(VERSION).jar" >> $@
+       echo "java -Djava.library.path=\"$(libdir)\" -jar $(datadir)/sudokuki/$(PACKAGE)-$(VERSION).jar" >> $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/src/Makefile.am b/src/Makefile.am
index e1badc1..e47c0ac 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ bin_SCRIPTS = $(PACKAGE)
 EXTRA_SCRIPTS = sudokuki
 sudokuki:
        echo "#!/bin/sh" > $@ ; \
-       echo "java -Djava.library.path=\"$(libdir)\" -jar $(datadir)/java/$(PACKAGE)-$(VERSION).jar" >> $@
+       echo "java -Djava.library.path=\"$(libdir)\" -jar $(datadir)/sudokuki/$(PACKAGE)-$(VERSION).jar" >> $@
 
 CLEANFILES = $(EXTRA_SCRIPTS) 
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 55d29aa..a2974ad 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -660,7 +660,7 @@ uninstall-am: uninstall-binSCRIPTS uninstall-libLTLIBRARIES
 
 sudokuki:
        echo "#!/bin/sh" > $@ ; \
-       echo "java -Djava.library.path=\"$(libdir)\" -jar $(datadir)/java/$(PACKAGE)-$(VERSION).jar" >> $@
+       echo "java -Djava.library.path=\"$(libdir)\" -jar $(datadir)/sudokuki/$(PACKAGE)-$(VERSION).jar" >> $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/src/classes/Makefile b/src/classes/Makefile
index 37419f1..87e9a51 100644 (file)
--- a/src/classes/Makefile
+++ b/src/classes/Makefile
@@ -30,8 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i486-pc-linux-gnu
-host_triplet = i486-pc-linux-gnu
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
 DIST_COMMON = $(dist_noinst_JAVA) $(srcdir)/DIST_NOINST_JAVA.include \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 subdir = src/classes
@@ -102,7 +102,7 @@ JAVAC = /usr/bin/javac
 JAVAH = /usr/bin/javah
 JAVA_HOME = /usr
 LD = /usr/bin/ld
-LDFLAGS = -Wl,-z,defs
+LDFLAGS = 
 LIBICONV = -liconv
 LIBINTL = 
 LIBOBJS = 
@@ -159,9 +159,9 @@ am__quote =
 am__tar = tar --format=posix -chf - "$$tardir"
 am__untar = tar -xf -
 bindir = ${exec_prefix}/bin
-build = i486-pc-linux-gnu
-build_alias = i486-linux-gnu
-build_cpu = i486
+build = i686-pc-linux-gnu
+build_alias = 
+build_cpu = i686
 build_os = linux-gnu
 build_vendor = pc
 builddir = .
@@ -170,24 +170,24 @@ datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i486-pc-linux-gnu
+host = i686-pc-linux-gnu
 host_alias = 
-host_cpu = i486
+host_cpu = i686
 host_os = linux-gnu
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
-infodir = ${prefix}/share/info
+infodir = ${datarootdir}/info
 install_sh = $(SHELL) /home/sylvain/Devs/sudokukiTrunk/sudokuki/build-aux/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
-mandir = ${prefix}/share/man
+mandir = ${datarootdir}/man
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
+prefix = /usr/local
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
@@ -200,7 +200,7 @@ top_srcdir = ../..
 JAVAROOT = $(top_builddir)/tmpjar
 JAVASRCDIR = $(top_builddir)/src/classes
 jarfile = $(top_builddir)/$(PACKAGE)-$(VERSION).jar
-jardir = $(datadir)/java
+jardir = $(datadir)/sudokuki
 jar_DATA = $(jarfile)
 dist_noinst_JAVA = \
 net/jankenpoi/sudokuki/model/GridModel.java  \

diff --git a/src/classes/Makefile.am b/src/classes/Makefile.am
index 4f2c58c..ef4085d 100644 (file)
--- a/src/classes/Makefile.am
+++ b/src/classes/Makefile.am
@@ -1,7 +1,7 @@
 JAVAROOT = $(top_builddir)/tmpjar
 JAVASRCDIR = $(top_builddir)/src/classes
 jarfile = $(top_builddir)/$(PACKAGE)-$(VERSION).jar
-jardir = $(datadir)/java
+jardir = $(datadir)/sudokuki
 jar_DATA = $(jarfile)
 
 JAVA_HOME=@JAVA_HOME@

diff --git a/src/classes/Makefile.in b/src/classes/Makefile.in
index af478df..89ddaf1 100644 (file)
--- a/src/classes/Makefile.in
+++ b/src/classes/Makefile.in
@@ -200,7 +200,7 @@ top_srcdir = @top_srcdir@
 JAVAROOT = $(top_builddir)/tmpjar
 JAVASRCDIR = $(top_builddir)/src/classes
 jarfile = $(top_builddir)/$(PACKAGE)-$(VERSION).jar
-jardir = $(datadir)/java
+jardir = $(datadir)/sudokuki
 jar_DATA = $(jarfile)
 dist_noinst_JAVA = \
 net/jankenpoi/sudokuki/model/GridModel.java  \

diff --git a/src/resources/Makefile b/src/resources/Makefile
index 91baaf3..318521c 100644 (file)
--- a/src/resources/Makefile
+++ b/src/resources/Makefile
@@ -29,8 +29,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i486-pc-linux-gnu
-host_triplet = i486-pc-linux-gnu
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
 DIST_COMMON = $(srcdir)/EXTRA_DIST.include $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
 subdir = src/resources
@@ -91,7 +91,7 @@ JAVAC = /usr/bin/javac
 JAVAH = /usr/bin/javah
 JAVA_HOME = /usr
 LD = /usr/bin/ld
-LDFLAGS = -Wl,-z,defs
+LDFLAGS = 
 LIBICONV = -liconv
 LIBINTL = 
 LIBOBJS = 
@@ -148,9 +148,9 @@ am__quote =
 am__tar = tar --format=posix -chf - "$$tardir"
 am__untar = tar -xf -
 bindir = ${exec_prefix}/bin
-build = i486-pc-linux-gnu
-build_alias = i486-linux-gnu
-build_cpu = i486
+build = i686-pc-linux-gnu
+build_alias = 
+build_cpu = i686
 build_os = linux-gnu
 build_vendor = pc
 builddir = .
@@ -159,24 +159,24 @@ datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i486-pc-linux-gnu
+host = i686-pc-linux-gnu
 host_alias = 
-host_cpu = i486
+host_cpu = i686
 host_os = linux-gnu
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
-infodir = ${prefix}/share/info
+infodir = ${datarootdir}/info
 install_sh = $(SHELL) /home/sylvain/Devs/sudokukiTrunk/sudokuki/build-aux/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
-mandir = ${prefix}/share/man
+mandir = ${datarootdir}/man
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
+prefix = /usr/local
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin

diff --git a/src/suexg/Makefile b/src/suexg/Makefile
index 6b912af..dac6c78 100644 (file)
--- a/src/suexg/Makefile
+++ b/src/suexg/Makefile
@@ -30,8 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i486-pc-linux-gnu
-host_triplet = i486-pc-linux-gnu
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
 subdir = src/suexg
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -119,7 +119,7 @@ JAVAC = /usr/bin/javac
 JAVAH = /usr/bin/javah
 JAVA_HOME = /usr
 LD = /usr/bin/ld
-LDFLAGS = -Wl,-z,defs
+LDFLAGS = 
 LIBICONV = -liconv
 LIBINTL = 
 LIBOBJS = 
@@ -176,9 +176,9 @@ am__quote =
 am__tar = tar --format=posix -chf - "$$tardir"
 am__untar = tar -xf -
 bindir = ${exec_prefix}/bin
-build = i486-pc-linux-gnu
-build_alias = i486-linux-gnu
-build_cpu = i486
+build = i686-pc-linux-gnu
+build_alias = 
+build_cpu = i686
 build_os = linux-gnu
 build_vendor = pc
 builddir = .
@@ -187,24 +187,24 @@ datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i486-pc-linux-gnu
+host = i686-pc-linux-gnu
 host_alias = 
-host_cpu = i486
+host_cpu = i686
 host_os = linux-gnu
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
-infodir = ${prefix}/share/info
+infodir = ${datarootdir}/info
 install_sh = $(SHELL) /home/sylvain/Devs/sudokukiTrunk/sudokuki/build-aux/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
-mandir = ${prefix}/share/man
+mandir = ${datarootdir}/man
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
+prefix = /usr/local
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin