[Git][java-team/jmagick][master] 8 commits: Standards-Version updated to 4.1.4
Emmanuel Bourg
gitlab at salsa.debian.org
Fri May 11 11:04:59 BST 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jmagick
Commits:
ae358658 by Emmanuel Bourg at 2018-05-11T00:39:47+02:00
Standards-Version updated to 4.1.4
- - - - -
d17730d5 by Emmanuel Bourg at 2018-05-11T11:41:37+02:00
Switch to debhelper level 10
- - - - -
39f2ee7b by Emmanuel Bourg at 2018-05-11T11:42:02+02:00
Use salsa.debian.org Vcs-* URLs
- - - - -
f41c11fc by Emmanuel Bourg at 2018-05-11T11:42:04+02:00
Fixed the build failure with Java 10 (Closes: #897456)
- - - - -
29dd5c41 by Emmanuel Bourg at 2018-05-11T11:42:04+02:00
Call mh_install in debian/rules instead of mh_installpom+mh_installjar
- - - - -
48a2e1fa by Emmanuel Bourg at 2018-05-11T11:48:32+02:00
Removed the build dependency on autotools-dev
- - - - -
83486edb by Emmanuel Bourg at 2018-05-11T11:50:05+02:00
Modified the package description
- - - - -
fa685029 by Emmanuel Bourg at 2018-05-11T11:51:05+02:00
Upload to unstable
- - - - -
7 changed files:
- debian/changelog
- debian/compat
- debian/control
- + debian/libjmagick6-java.poms
- + debian/patches/04_java10_compatibility.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,19 @@
-jmagick (6.6.9~20130201-svn99-4) UNRELEASED; urgency=medium
+jmagick (6.6.9~20130201-svn99-4) unstable; urgency=medium
* Team upload.
+
+ [ tony mancill ]
* Apply patch for missing getByteArrayFieldValue prototype.
- Thanks to Adam Conrad for the patch. (Closes: #727776)
- -- tony mancill <tmancill at debian.org> Wed, 17 May 2017 21:38:38 -0700
+ [ Emmanuel Bourg ]
+ * Fixed the build failure with Java 10 (Closes: #897456)
+ * Standards-Version updated to 4.1.4
+ * Switch to debhelper level 10
+ * Removed the build dependency on autotools-dev
+ * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 11 May 2018 11:50:43 +0200
jmagick (6.6.9~20130201-svn99-3) unstable; urgency=medium
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,16 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Varun Hiremath <varun at debian.org>
Section: graphics
Priority: optional
-Standards-Version: 3.9.8
-Build-Depends: autotools-dev,
- cdbs,
+Standards-Version: 4.1.4
+Build-Depends: cdbs,
chrpath,
- debhelper (>= 9),
+ debhelper (>= 10),
default-jdk,
libmagickcore-dev,
maven-repo-helper,
autoconf
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jmagick.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jmagick.git
+Vcs-Git: https://salsa.debian.org/java-team/jmagick.git
+Vcs-Browser: https://salsa.debian.org/java-team/jmagick
Homepage: http://sourceforge.net/projects/jmagick/
Package: libjmagick6-java
@@ -21,7 +20,7 @@ Architecture: all
Section: java
Depends: ${misc:Depends}, libjmagick6-jni (>= ${source:Version})
Provides: jmagick
-Description: java interface to ImageMagick - java classes
+Description: Java interface to ImageMagick
JMagick is an open source Java interface of ImageMagick. It is
implemented in the form of Java Native Interface (JNI) into the
ImageMagick API.
@@ -39,7 +38,7 @@ Section: doc
Architecture: all
Provides: jmagick-docs
Depends: ${misc:Depends}
-Description: java interface to ImageMagick - api documentation
+Description: Java interface to ImageMagick (documentation)
JMagick is an open source Java interface of ImageMagick. It is
implemented in the form of Java Native Interface (JNI) into the
ImageMagick API.
@@ -57,7 +56,7 @@ Description: java interface to ImageMagick - api documentation
Package: libjmagick6-jni
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: java interface to ImageMagick - native library
+Description: Java interface to ImageMagick (native library)
JMagick is an open source Java interface of ImageMagick. It is
implemented in the form of Java Native Interface (JNI) into the
ImageMagick API.
=====================================
debian/libjmagick6-java.poms
=====================================
--- /dev/null
+++ b/debian/libjmagick6-java.poms
@@ -0,0 +1 @@
+debian/pom.xml --java-lib --artifact=lib/jmagick.jar
=====================================
debian/patches/04_java10_compatibility.patch
=====================================
--- /dev/null
+++ b/debian/patches/04_java10_compatibility.patch
@@ -0,0 +1,41 @@
+Description: Fixes the build failure with Java 10
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/configure.in
++++ b/configure.in
+@@ -211,13 +211,6 @@
+ fi
+ AC_SUBST(JAVAC)
+
+-dnl Determine if we have the Java header file generator
+-AC_PATH_PROG(JAVAH, javah, not_found)
+-if test ${JAVAH} = not_found; then
+- AC_MSG_ERROR('No Java header generator (javah) found')
+-fi
+-AC_SUBST(JAVAH)
+-
+ dnl Determine if we have jar
+ AC_PATH_PROG(JAR, jar, not_found)
+ if test ${JAR} = not_found; then
+--- a/Make.rules
++++ b/Make.rules
+@@ -71,6 +71,7 @@
+ $(JAVA_PACKAGE_DIR)/%.class: %.java
+ @-mkdir -p $(dir $@)
+ $(JAVAC) $(JFLAGS) -d $(JAVA_CLASSES_DIR) \
++ -h $(PACKAGE_GENERATED_DIR) \
+ -sourcepath $(JAVA_SRC_DIR) \
+ -classpath $(JAVA_CLASS_PATH) $<
+
+@@ -120,11 +121,6 @@
+ # Rule to make header files from java class files.
+ # The originating java source must contain native method specifications.
+ $(PACKAGE_GENERATED_DIR)/$(JNI_HEADER_PREFIX)_%.h: $(JAVA_PACKAGE_DIR)/%.class
+- @-rm $@ > /dev/null 2>&1
+- @-mkdir -p $(dir $@)
+- "$(JAVAH)" -d $(PACKAGE_GENERATED_DIR) -jni \
+- -classpath $(JAVA_CLASS_PATH) \
+- $(JAVA_PACKAGE).$(subst .class,,$(notdir $<))
+
+ # Rule to compile JNI C files
+ $(PACKAGE_OBJ_DIR)/%.lo: %.c $(PACKAGE_GENERATED_DIR)/%.h
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_fix_load_jnilib.patch
02_jmagick_implicit_decl.patch
0001-Use-pkgconfig-for-flags.patch
+04_java10_compatibility.patch
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -19,11 +19,10 @@ DEB_INSTALL_CHANGELOGS_ALL := Changelog.txt
DEB_AUTO_UPDATE_AUTOCONF := yes
VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^~-]+).*,\1,p')
-export JFLAGS = -source 1.6 -target 1.6 -g
+export JFLAGS = --release 7 -g
install/libjmagick6-java::
- mh_installpom -plibjmagick6-java -e$(VERSION) debian/pom.xml
- mh_installjar -plibjmagick6-java -e$(VERSION) --java-lib debian/pom.xml lib/jmagick.jar
+ mh_install
install/libjmagick6-jni::
chrpath -d ./lib/libJMagick.so
@@ -39,9 +38,5 @@ clean::
rm -rf lib/*.jar
mh_clean
-.PHONY: get-orig-source
-get-orig-source:
- uscan --upstream-version 0 --force-download --rename
-
get-orig-pom:
wget http://central.maven.org/maven2/jmagick/jmagick/$(VERSION)/jmagick-$(VERSION).pom -O debian/pom.xml
View it on GitLab: https://salsa.debian.org/java-team/jmagick/compare/8ea505c6f015d4315a7341e04dcf80e659d9deae...fa685029b87e983028b3b00704aa4ba75e3ecbc6
---
View it on GitLab: https://salsa.debian.org/java-team/jmagick/compare/8ea505c6f015d4315a7341e04dcf80e659d9deae...fa685029b87e983028b3b00704aa4ba75e3ecbc6
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/20180511/fe48a624/attachment.html>
More information about the pkg-java-commits
mailing list