[Git][java-team/jmagick][master] 3 commits: Move to debhelper rules
Bastien Roucariès (@rouca)
gitlab at salsa.debian.org
Fri Aug 30 13:15:35 BST 2024
Bastien Roucariès pushed to branch master at Debian Java Maintainers / jmagick
Commits:
d06de3a2 by Bastien Roucariès at 2024-08-30T10:49:22+00:00
Move to debhelper rules
- - - - -
1cea7625 by Bastien Roucariès at 2024-08-30T10:52:49+00:00
Enable foreign mode for automake
- - - - -
50f2adf8 by Bastien Roucariès at 2024-08-30T12:13:22+00:00
Refresh patches
- - - - -
7 changed files:
- debian/patches/0001-Use-pkgconfig-for-flags.patch
- + debian/patches/0003-Enable-foreign-mode-for-automake.patch
- + debian/patches/0004-Enable-foreign-mode-for-automake.patch
- debian/patches/01_fix_load_jnilib.patch
- debian/patches/02_jmagick_implicit_decl.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/patches/0001-Use-pkgconfig-for-flags.patch
=====================================
@@ -1,67 +1,265 @@
-Index: jmagick/configure.ac
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 30 Aug 2024 10:50:53 +0000
+Subject: Use-pkgconfig-for-flags
+
===================================================================
---- jmagick.orig/configure.ac
-+++ jmagick/configure.ac
-@@ -270,22 +270,32 @@ AC_ARG_ENABLE([diagnostic],
+---
+ Makefile.am | 4 ++
+ configure.ac | 214 +++++------------------------------------------------------
+ 2 files changed, 20 insertions(+), 198 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ba46d3d..65283b5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,6 +8,10 @@
+ #
+
+ ACLOCAL_AMFLAGS=-I m4
++AM_CFLAGS="$(MAGICK_CFLAGS) $(WAND_CFLAGS)"
++AM_LIBS="$(MAGICK_LIBS) $(WAND_LIBS)"
++AM_LDFLAGS="$(MAGICK_LDLAGS) $(WAND_LDFLAGS)"
++
+ MAKE_PATH = .
+ include $(MAKE_PATH)/Make.def
+
+diff --git a/configure.ac b/configure.ac
+index 118c184..c510209 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -271,207 +271,19 @@ AC_ARG_ENABLE([diagnostic],
[C_DEBUG=])
AC_SUBST(C_DEBUG)
-+
-+AC_PATH_PROG(PKGCONFIG, pkg-config, not_found)
-+USE_PKGCONFIG='no'
-+if (test PKGCONFIG != 'not_found') ; then
-+ if pkg-config MagickCore > /dev/null 2>/dev/null; then
-+ USE_PKGCONFIG='yes'
-+ fi
-+fi
-+
- AC_ARG_WITH([magick-version],
- AS_HELP_STRING([--with-magick-version=VERSION],
- [ImageMagick version]),
- [MAGICK_VERSION="${withval}"])
+-AC_ARG_WITH([magick-version],
+- AS_HELP_STRING([--with-magick-version=VERSION],
+- [ImageMagick version]),
+- [MAGICK_VERSION="${withval}"])
-if (test -n "$MAGICK_VERSION"); then
- VER_MAJOR=$(echo "$MAGICK_VERSION" | cut -d . -f 1)
- VER_MINOR=$(echo "$MAGICK_VERSION" | cut -d . -f 2)
- VER_MICRO=$(echo "$MAGICK_VERSION" | cut -d . -f 3)
-fi
++PKG_PREREQ
++PKG_PROG_PKG_CONFIG
-dnl Check if ImageMagick home specified
- AC_ARG_WITH([magick-home],
- AS_HELP_STRING([--with-magick-home=PATH],
- [home directory of ImageMagick]),
- [MAGICK_HOME="${withval}"])
+-AC_ARG_WITH([magick-home],
+- AS_HELP_STRING([--with-magick-home=PATH],
+- [home directory of ImageMagick]),
+- [MAGICK_HOME="${withval}"])
+-
+-for MPATH in ${MAGICK_HOME} /usr /usr/local /usr/local/ImageMagick /usr/local/ImageMagick-${VER_MAJOR}.${VER_MINOR}.${VER_MICRO} ; do
+- # Location before IM 6.3.8.something
+- if test -f "${MPATH}/include/magick/api.h" ; then
+- MAGICK_LIB_PATH=${MPATH}/lib
+- case "$target" in
+- *-*-cygwin|*-*-mingw32)
+- MAGICK_LIBS="-L${MPATH}/lib -lCORE_RL_wand_ -lCORE_RL_magick_"
+- MAGICK_CHECK_LIBS="CORE_RL_wand_ CORE_RL_magick_"
+- ;;
+- *)
+- MAGICK_LIBS="-L${MPATH}/lib -lWand -lMagick"
+- MAGICK_CHECK_LIBS="Wand Magick"
+- ;;
+- esac
+- MAGICK_INCLUDES=-I${MPATH}/include
+- MAGICK_REALHOME=${MPATH}
+- MAGICK_VERSION=6
+- fi
+- # Location after IM 6.3.8.something
+- if test -f "${MPATH}/include/ImageMagick/magick/api.h" ; then
+- MAGICK_LIB_PATH=${MPATH}/lib
+- case "$target" in
+- *-*-cygwin|*-*-mingw32)
+- MAGICK_LIBS="-L${MPATH}/lib -lCORE_RL_wand_ -lCORE_RL_magick_"
+- MAGICK_CHECK_LIBS="CORE_RL_wand_ CORE_RL_magick_"
+- ;;
+- *)
+- MAGICK_LIBS="-L${MPATH}/lib -lWand -lMagick"
+- MAGICK_CHECK_LIBS="Wand Magick"
+- ;;
+- esac
+- MAGICK_INCLUDES=-I${MPATH}/include/ImageMagick
+- MAGICK_REALHOME=${MPATH}
+- MAGICK_VERSION=6
+- fi
+- # Location after Ubuntu 16.04
+- if test -f "${MPATH}/include/ImageMagick-6/magick/api.h" ; then
+- MAGICK_LIB_PATH=${MPATH}/lib
+- case "$target" in
+- *-*-cygwin|*-*-mingw32)
+- MAGICK_LIBS="-L${MPATH}/lib -lCORE_RL_wand_ -lCORE_RL_magick_"
+- MAGICK_CHECK_LIBS="CORE_RL_wand_ CORE_RL_magick_"
+- ;;
+- *)
+- MAGICK_LIBS="-L${MPATH}/lib -lWand -lMagick"
+- MAGICK_CHECK_LIBS="Wand Magick"
+- ;;
+- esac
+- MAGICK_INCLUDES=-I${MPATH}/include/ImageMagick-6
+- MAGICK_REALHOME=${MPATH}
+- MAGICK_VERSION=6
+- fi
+- # Location after IM 7.something
+- if test -f "${MPATH}/include/MagickCore/MagickCore.h" ; then
+- MAGICK_LIB_PATH=${MPATH}/lib
+- case "$target" in
+- *-*-cygwin|*-*-mingw32)
+- MAGICK_LIBS="-L${MPATH}/lib -lCORE_RL_MagickWand_ -lCORE_RL_MagickCore_"
+- MAGICK_CHECK_LIBS="CORE_RL_MagickWand_ CORE_RL_MagickCore_"
+- ;;
+- *)
+- MAGICK_LIBS="-L${MPATH}/lib -lMagickWand -lMagickCore"
+- MAGICK_CHECK_LIBS="MagickWand MagickCore"
+- ;;
+- esac
+- MAGICK_INCLUDES=-I${MPATH}/include
+- MAGICK_REALHOME=${MPATH}
+- MAGICK_VERSION=7
+- fi
+- # Location for some Linux distros
+- if test -f "${MPATH}/include/ImageMagick-7/MagickCore/MagickCore.h" ; then
+- MAGICK_LIB_PATH=${MPATH}/lib
+- case "$target" in
+- *-*-cygwin|*-*-mingw32)
+- MAGICK_LIBS="-L${MPATH}/lib -lCORE_RL_MagickWand_ -lCORE_RL_MagickCore_"
+- MAGICK_CHECK_LIBS="CORE_RL_MagickWand_ CORE_RL_MagickCore_"
+- ;;
+- *)
+- MAGICK_LIBS="-L${MPATH}/lib -lMagickWand -lMagickCore"
+- MAGICK_CHECK_LIBS="MagickWand MagickCore"
+- ;;
+- esac
+- MAGICK_INCLUDES=-I${MPATH}/include/ImageMagick-7
+- MAGICK_REALHOME=${MPATH}
+- MAGICK_VERSION=7
+- fi
+-done
-+if (test USE_PKGCONFIG == 'no') ; then
-+if (test -n "$MAGICK_VERSION"); then
-+ VER_MAJOR=$(echo "$MAGICK_VERSION" | cut -d . -f 1)
-+ VER_MINOR=$(echo "$MAGICK_VERSION" | cut -d . -f 2)
-+ VER_MICRO=$(echo "$MAGICK_VERSION" | cut -d . -f 3)
-+dnl Check if ImageMagick home specified
-+
- for MPATH in ${MAGICK_HOME} /usr /usr/local /usr/local/ImageMagick /usr/local/ImageMagick-${VER_MAJOR}.${VER_MINOR}.${VER_MICRO} ; do
- # Location before IM 6.3.8.something
- if test -f "${MPATH}/include/magick/api.h" ; then
-@@ -455,7 +465,6 @@ OLD_LDFLAGS=${LDFLAGS}
- if test -n "${MAGICK_LIBS}"; then
- LDFLAGS="${MAGICK_LIBS} ${LDFLAGS}"
+-dnl Check if MagickWand-conf exists
+-OLDPATH=${PATH}
+-# MagickWand-config isn't installed in /usr/bin in Ubuntu 16.04+ due
+-# to changes in libmagickcore-dev package.
+-AC_ARG_WITH([magickwand-config],
+- AS_HELP_STRING([--with-magickwand-config=PATH],
+- [path to magickwand-config tool]),
+- [magickwand_config="$withval"],
+- [magickwand_config=""])
+-
+-if test -n "$magickwand_config"; then
+- MAGICKCONF="$magickwand_config"
+-else
+- PATH=${MAGICK_REALHOME}/bin:/usr/${LIB}/${build_os}/ImageMagick-${VER_MAJOR}.${VER_MINOR}.${VER_MICRO}-Q64HDRI/bin:/usr/${LIB}/${build_os}/ImageMagick-${VER_MAJOR}.${VER_MINOR}.${VER_MICRO}-Q64/bin:/usr/${LIB}/${build_os}/ImageMagick-${VER_MAJOR}.${VER_MINOR}.${VER_MICRO}-Q32HDRI/bin:/usr/${LIB}/${build_os}/ImageMagick-${VER_MAJOR}.${VER_MINOR}.${VER_MICRO}-Q32/bin:/usr/${LIB}/${build_os}/ImageMagick-${VER_MAJOR}.${VER_MINOR}.${VER_MICRO}-Q16HDRI/bin:/usr/${LIB}/${build_os}/ImageMagick-${VER_MAJOR}.${VER_MINOR}.${VER_MICRO}-Q16/bin:/usr/${LIB}/${build_os}/ImageMagick-${VER_MAJOR}.${VER_MINOR}.${VER_MICRO}-Q8HDRI/bin:/usr/${LIB}/${build_os}/ImageMagick-${VER_MAJOR}.${VER_MINOR}.${VER_MICRO}-Q8/bin:/usr/${LIB}/${build_os}/ImageMagick-${VER_MAJOR}.${VER_MINOR}.${VER_MICRO}/bin:${PATH}
+- export PATH
+- AC_PATH_PROG(MAGICKCONF, MagickWand-config, not_found)
+- PATH=${OLDPATH}
+- export PATH
++if test "$PKGCONFIG" != "no" ; then
++ MAGICK_LIBS="`$PKGCONFIG --libs-only-l MagickCore`"
++ MAGICK_LDFLAGS="`$PKGCONFIG --libs-only-L MagickCore`"
++ MAGICK_CFLAGS="`$PKGCONFIG --cflags MagickCore`"
++ WAND_LIBS="`$PKGCONFIG --libs-only-l MagickWand`"
++ WAND_LDFLAGS="`$PKGCONFIG --libs-only-L MagickWand`"
++ WAND_CFLAGS="`$PKGCONFIG --cflags MagickWand`"
fi
-
- MAGICK_CHECK_LIB_FUNCTIONS="NewPixelWand ConstituteImage"
- MLIB_INDEX=1
- for MLIB in ${MAGICK_CHECK_LIBS} ; do
-@@ -470,7 +479,14 @@ done
-
- CPPFLAGS=${OLD_CPPFLAGS}
- LDFLAGS=${OLD_LDFLAGS}
+-dnl Added $MAGICK_LIB_PATH and $MAGICK_INCLUDES here because of
+-dnl a possible bug in Magick-conf for ImageMagick 5.4.6
+-if (test $MAGICKCONF != not_found); then
+- LDFLAGS="${LDFLAGS} `$MAGICKCONF --ldflags`"
+- MAGICK_LIBS="`$MAGICKCONF --libs`"
+- MAGICK_INCLUDES=`$MAGICKCONF --cppflags`
+- MAGICK_LIB_PATH=`$MAGICKCONF --exec-prefix`/lib
+- MAGICK_REALHOME=`$MAGICKCONF --exec-prefix`
+- MAGICK_CHECK_LIBS=`$MAGICKCONF --libs | awk 'function ltrim(s) { sub(/^[ \t\r\n]+/, "", s); return s } function rtrim(s) { sub(/[ \t\r\n]+$/, "", s); return s } function trim(s) { return rtrim(ltrim(s)); } END { for (i = 1; i <= NF; i++) { if ( substr($i, 0, 2) != "-l") {$i=""} else {$i=substr($i,3)}} print trim($0)}'`
+- MAGICK_VERSION=`$MAGICKCONF --version | cut -c1`
+-fi
+-
+-dnl Check if ImageMagick library path specified
+-AC_ARG_WITH([magick-lib-dir],
+- AS_HELP_STRING([--with-magick-lib-dir=PATH],
+- [library path of ImageMagick]),
+- [MAGICK_LIB_PATH="${withval}"],
+- [MAGICK_LIBS="-L${withval}"])
+-
+-dnl Check if ImageMagick include path specified
+-AC_ARG_WITH([magick-inc-dir],
+- AS_HELP_STRING([--with-magick-inc-dir=PATH],
+- [path include path of ImageMagick]),
+- [MAGICK_INCLUDES="-I${withval}"])
+-
+-if ( test -f "${MAGICK_INCLUDE_PATH}/magick/api.h" ) ; then
+- MAGICK_INCLUDES=-I${MAGICK_INCLUDE_PATH}
+- MAGICK_VERSION=6
+-fi
+-if ( test -f "${MAGICK_INCLUDE_PATH}/MagickCore/MagickCore.h" ) ; then
+- MAGICK_INCLUDES=-I${MAGICK_INCLUDE_PATH}
+- MAGICK_VERSION=7
+-fi
+-
+-dnl Ensure proper includes in source files
+-CFLAGS="${CFLAGS} -DIMAGEMAGICK_HEADER_STYLE_${MAGICK_VERSION}"
+-
+-dnl Check for the ImageMagick headers
+-OLD_CPPFLAGS=${CPPFLAGS}
+-if test -n "${MAGICK_INCLUDES}"; then
+- CPPFLAGS="${MAGICK_INCLUDES} ${CPPFLAGS}"
+-fi
+-
+-if test "${MAGICK_VERSION}" = 7 ; then
+- MAGICK_CHECK_HEADERS="MagickWand/MagickWand.h MagickCore/MagickCore.h"
+-elif test "${MAGICK_VERSION}" = 6 ; then
+- MAGICK_CHECK_HEADERS="wand/magick-wand.h magick/api.h"
+-fi
+-
+-for MHEADER in ${MAGICK_CHECK_HEADERS} ; do
+- AC_CHECK_HEADER(${MHEADER}, HAVE_MAGICK_HEADER=yes, HAVE_MAGICK_HEADER=no)
+- if test "${HAVE_MAGICK_HEADER}" = no ; then
+- AC_MSG_ERROR('Unable to find ImageMagick header file: ${MHEADER}')
+- fi
+-done
+-
+-dnl Check for the ImageMagick libraries
+-OLD_LDFLAGS=${LDFLAGS}
+-if test -n "${MAGICK_LIBS}"; then
+- LDFLAGS="${MAGICK_LIBS} ${LDFLAGS}"
+-fi
+-
+-MAGICK_CHECK_LIB_FUNCTIONS="NewPixelWand ConstituteImage"
+-MLIB_INDEX=1
+-for MLIB in ${MAGICK_CHECK_LIBS} ; do
+- MLIBFUNCTION=`echo ${MAGICK_CHECK_LIB_FUNCTIONS} | awk "{print \\$$MLIB_INDEX}"`
+- AC_CHECK_LIB(${MLIB}, ${MLIBFUNCTION},
+- HAVE_MAGICK_LIB=yes, HAVE_MAGICK_LIB=no)
+- if test ${HAVE_MAGICK_LIB} = no; then
+- AC_MSG_ERROR('Unable to find ImageMagick library: ${MLIB}')
+- fi
+- (( MLIB_INDEX++ ))
+-done
+-
+-CPPFLAGS=${OLD_CPPFLAGS}
+-LDFLAGS=${OLD_LDFLAGS}
-
-+# pkgconfig
-+else
-+ MAGICK_LIBS=`pkg-config --libs-only-l MagickCore`
-+ MAGICK_LDFLAGS=`pkg-config --libs-only-L --libs-only-other MagickCore`
-+ MAGICK_CFLAGS=`pkg-config --cflags-only-other MagickCore`
-+ MAGICK_INCLUDES=`pkg-config --cflags-only-I MagickCore`
-+ HAVE_MAGICK_LIB='yes';
-+fi
++HAVE_MAGICK_LIB='yes';
dnl Configure libtool
+@@ -483,11 +295,17 @@ AC_SUBST(X11_LIBS)
+ AC_SUBST(X11_INCLUDES)
+ AC_SUBST(MAGICK_LIB_PATH)
+ AC_SUBST(MAGICK_LIBS)
++AC_SUBST(MAGICK_LDFLAGS)
+ AC_SUBST(MAGICK_INCLUDES)
+ AC_SUBST(CFLAGS)
++AC_SUBST(MAGICK_CPPFLAGS)
++AC_SUBST(WAND_CPPFLAGS)
++AC_SUBST(WAND_LDFLAGS)
+ AC_SUBST(LDFLAGS)
+ AC_SUBST(JFLAGS)
+ AC_SUBST(LIBS)
++AC_SUBST(MAGICK_LIBS)
++AC_SUBST(WAND_LIBS)
+ AC_SUBST(SHARED_LDFLAGS)
+ AC_SUBST(LIBTOOL_LINK_FLAG)
+ AC_SUBST(SHARED_LIB_EXT)
=====================================
debian/patches/0003-Enable-foreign-mode-for-automake.patch
=====================================
@@ -0,0 +1,37 @@
+From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca at debian.org>
+Date: Fri, 30 Aug 2024 10:52:19 +0000
+Subject: Enable foreign mode for automake
+
+forwarded: not-needed
+---
+ Makefile.am | 2 +-
+ configure.ac | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 12cab07..ba46d3d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,7 @@
+ # Contributed by Adam Heath <doogie at brainfood.com>
+ #
+
+-
++ACLOCAL_AMFLAGS=-I m4
+ MAKE_PATH = .
+ include $(MAKE_PATH)/Make.def
+
+diff --git a/configure.ac b/configure.ac
+index 8d2c635..118c184 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,7 +8,8 @@ AC_CANONICAL_BUILD
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+
+-AM_INIT_AUTOMAKE([-Wno-portability])
++AM_INIT_AUTOMAKE([-Wno-portability, foreign])
++AC_CONFIG_MACRO_DIRS([m4])
+ VER_MAJOR=$(echo "$PACKAGE_VERSION" | cut -d . -f 1)
+ VER_MINOR=$(echo "$PACKAGE_VERSION" | cut -d . -f 2)
+ VER_MICRO=$(echo "$PACKAGE_VERSION" | cut -d . -f 3)
=====================================
debian/patches/0004-Enable-foreign-mode-for-automake.patch
=====================================
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <rouca at debian.org>
+Date: Fri, 30 Aug 2024 10:52:19 +0000
+Subject: Enable foreign mode for automake
+
+forwarded: not-needed
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9165f2b..408910b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,7 +8,7 @@ AC_CANONICAL_BUILD
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+
+-AM_INIT_AUTOMAKE([-Wno-portability])
++AM_INIT_AUTOMAKE([-Wno-portability, foreign])
+ VER_MAJOR=$(echo "$PACKAGE_VERSION" | cut -d . -f 1)
+ VER_MINOR=$(echo "$PACKAGE_VERSION" | cut -d . -f 2)
+ VER_MICRO=$(echo "$PACKAGE_VERSION" | cut -d . -f 3)
=====================================
debian/patches/01_fix_load_jnilib.patch
=====================================
@@ -1,10 +1,18 @@
-Description: Ensure that the JNI interface is loaded
-Author: Kumar Appaiah <akumar at debian.org>
+From: Kumar Appaiah <akumar at debian.org>
+Date: Fri, 30 Aug 2024 10:50:53 +0000
+Subject: Ensure that the JNI interface is loaded
+
Forwarded: not-needed
-Index: jmagick/src/magick/Magick.java
+
===================================================================
---- jmagick.orig/src/magick/Magick.java
-+++ jmagick/src/magick/Magick.java
+---
+ src/magick/Magick.java | 26 +-------------------------
+ 1 file changed, 1 insertion(+), 25 deletions(-)
+
+diff --git a/src/magick/Magick.java b/src/magick/Magick.java
+index ab78a0e..38be099 100644
+--- a/src/magick/Magick.java
++++ b/src/magick/Magick.java
@@ -15,31 +15,7 @@ import java.awt.Rectangle;
public class Magick {
=====================================
debian/patches/02_jmagick_implicit_decl.patch
=====================================
@@ -1,14 +1,20 @@
-Description: Include the missing prototype for getByteArrayFieldValue
-Author: Adam Conrad <adconrad at ubuntu.com>
+From: Adam Conrad <adconrad at ubuntu.com>
+Date: Fri, 30 Aug 2024 10:50:53 +0000
+Subject: Include the missing prototype for getByteArrayFieldValue
-Index: jmagick/src/magick/jmagick.h
-===================================================================
---- jmagick.orig/src/magick/jmagick.h
-+++ jmagick/src/magick/jmagick.h
-@@ -158,6 +158,29 @@ unsigned char* getByteArrayFieldValue(JN
+---
+ src/magick/jmagick.h | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/src/magick/jmagick.h b/src/magick/jmagick.h
+index d861702..f690dfa 100644
+--- a/src/magick/jmagick.h
++++ b/src/magick/jmagick.h
+@@ -157,6 +157,29 @@ unsigned char* getByteArrayFieldValue(JNIEnv *env,
+ jfieldID *fieldID,
int *size);
- /*
++/*
+ * Retrieve the byte array from the specified field.
+ *
+ * Input:
@@ -31,7 +37,6 @@ Index: jmagick/src/magick/jmagick.h
+ jfieldID *fieldID,
+ int *size);
+
-+/*
+ /*
* From a java.awt.Rectangle object, construct a ImageMagick
* RectangleInfo, as passed in from the parameter.
- *
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,4 @@
01_fix_load_jnilib.patch
02_jmagick_implicit_decl.patch
+0003-Enable-foreign-mode-for-automake.patch
0001-Use-pkgconfig-for-flags.patch
-#04_java10_compatibility.patch
=====================================
debian/rules
=====================================
@@ -1,43 +1,6 @@
#!/usr/bin/make -f
-JAVA_HOME := /usr/lib/jvm/default-java
+export JAVA_HOME=/usr/lib/jvm/default-java
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/java/java_defaults.mk
-
-CC=gcc
-DEB_CONFIGURE_SCRIPT_ENV += PATH=$(JAVA_HOME)/bin:$$PATH
-DEB_CONFIGURE_EXTRA_FLAGS = --libdir=/usr/lib/jni --with-java-home=$(JAVA_HOME)
-DEB_MAKE_CLEAN_TARGET = clean
-DEB_MAKE_BUILD_TARGET = all
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_CHECK_TARGET =
-DEB_DH_INSTALL_SOURCEDIR = debian/tmp
-DEB_COMPRESS_EXCLUDE = .java
-DEB_INSTALL_CHANGELOGS_ALL := Changelog.txt
-DEB_AUTO_UPDATE_AUTOCONF := yes
-VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^~-]+).*,\1,p')
-
-export JFLAGS = --release $(java_compat_level) -g
-
-install/libjmagick6-java::
- mh_install
-
-install/libjmagick6-jni::
- chrpath -d ./lib/libJMagick.so
- install -m 644 -D ./lib/libJMagick.so ./debian/libjmagick6-jni/usr/lib/jni/libJMagick.so
-
-install/jmagick6-docs::
- mkdir -p ./debian/jmagick6-docs/usr/share/doc/jmagick6-docs/api
- $(MAKE) javadoc DESTDIR=./debian/jmagick6-docs JAVADOC_DIR=./debian/jmagick6-docs/usr/share/doc/jmagick6-docs/api
-
-clean::
- rm -rf Make.def libtool config.cache config.log config.status obj/magick/.libs
- rm -rf autom4te.cache
- rm -rf lib/*.jar
- mh_clean
-
-get-orig-pom:
- wget http://central.maven.org/maven2/jmagick/jmagick/$(VERSION)/jmagick-$(VERSION).pom -O debian/pom.xml
+%:
+ dh $@ --with javahelper
\ No newline at end of file
View it on GitLab: https://salsa.debian.org/java-team/jmagick/-/compare/5eea8957c2a6b60af435556b89dfeb0125f3af56...50f2adf8e597d508ce26d3a140acdf73436a319a
--
View it on GitLab: https://salsa.debian.org/java-team/jmagick/-/compare/5eea8957c2a6b60af435556b89dfeb0125f3af56...50f2adf8e597d508ce26d3a140acdf73436a319a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240830/c4072978/attachment.htm>
More information about the pkg-java-commits
mailing list