Emmanuel Bourg pushed to branch master at Debian Java Maintainers / 
libnative-platform-java


Commits:
4b4192d8 by Emmanuel Bourg at 2018-05-17T11:35:43+02:00
Standards-Version updated to 4.1.4

- - - - -
5e3fb9f7 by Emmanuel Bourg at 2018-05-17T11:51:10+02:00
Fixed the build failure with Java 10 (Close: #898903)

- - - - -
02a7ee00 by Emmanuel Bourg at 2018-05-17T11:53:34+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
dce7631d by Emmanuel Bourg at 2018-05-17T11:53:48+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/Makefile
- debian/changelog
- debian/control
- debian/rules
- debian/watch


Changes:

=====================================
debian/Makefile
=====================================
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -32,16 +32,17 @@ JAVA_WITH_INTERNAL_SRC = $(shell find src/main/java -name 
"*.java" -print)
 
 build: $(BUILD_DIR)/libnative-platform.so 
$(BUILD_DIR)/libnative-platform-curses.so $(BUILD_DIR)/native-platform.jar 
javadoc
 
-$(BUILD_DIR)/libnative-platform.so: $(MAIN_CXX_SRC) $(BUILD_DIR)/native.h
+$(BUILD_DIR)/libnative-platform.so: $(MAIN_CXX_SRC) 
$(BUILD_DIR)/classes/%.class
        $(CXX) -shared $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(MAIN_CXX_SRC)
 
-$(BUILD_DIR)/libnative-platform-curses.so: $(CURSES_CXX_SRC) 
$(BUILD_DIR)/native.h
+$(BUILD_DIR)/libnative-platform-curses.so: $(CURSES_CXX_SRC) 
$(BUILD_DIR)/classes/%.class
        # "-l*" options must be put at the end, thus fixing symbol errors in 
Ubuntu.
        $(CXX) -shared $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ 
$(CURSES_CXX_SRC) -lcurses
 
 $(BUILD_DIR)/classes/%.class: $(JAVA_SRC)
        mkdir --parents $(BUILD_DIR)/classes
-       javac -source $(JAVA_TARGET_VERSION) -target $(JAVA_SOURCE_VERSION) 
-encoding UTF-8 -d $(BUILD_DIR)/classes $(JAVA_SRC)
+       javac -source $(JAVA_TARGET_VERSION) -target $(JAVA_SOURCE_VERSION) 
-encoding UTF-8 -d $(BUILD_DIR)/classes -h $(BUILD_DIR) $(JAVA_SRC)
+       cat $(BUILD_DIR)/net*.h > $(BUILD_DIR)/native.h
 
 javadoc: $(JAVA_WITH_INTERNAL_SRC)
        mkdir --parents $(BUILD_DIR)/javadoc
@@ -50,21 +51,6 @@ javadoc: $(JAVA_WITH_INTERNAL_SRC)
 $(BUILD_DIR)/native-platform.jar: $(BUILD_DIR)/classes/%.class
        jar cf $@ -C $(BUILD_DIR)/classes .
 
-$(BUILD_DIR)/native.h: $(BUILD_DIR)/classes/%.class
-       javah -o $(BUILD_DIR)/native.h -classpath $(BUILD_DIR)/classes \
-             net.rubygrapefruit.platform.internal.jni.NativeLibraryFunctions \
-             net.rubygrapefruit.platform.internal.jni.PosixFileFunctions \
-             net.rubygrapefruit.platform.internal.jni.PosixFileSystemFunctions 
\
-             net.rubygrapefruit.platform.internal.jni.PosixProcessFunctions \
-             net.rubygrapefruit.platform.internal.jni.PosixTerminalFunctions \
-             net.rubygrapefruit.platform.internal.jni.TerminfoFunctions \
-             net.rubygrapefruit.platform.internal.jni.WindowsConsoleFunctions \
-             net.rubygrapefruit.platform.internal.jni.WindowsHandleFunctions \
-             net.rubygrapefruit.platform.internal.jni.WindowsRegistryFunctions 
\
-             net.rubygrapefruit.platform.internal.jni.WindowsFileFunctions \
-             net.rubygrapefruit.platform.internal.jni.FileEventFunctions \
-             net.rubygrapefruit.platform.internal.jni.PosixTypeFunctions
-
 clean:
        $(RM) -r $(BUILD_DIR)/javadoc $(BUILD_DIR)/classes
        $(RM) $(BUILD_DIR)/*.jar $(BUILD_DIR)/*.so $(BUILD_DIR)/native.h


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libnative-platform-java (0.14-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 10 (Close: #898903)
+  * Standards-Version updated to 4.1.4
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebo...@apache.org>  Thu, 17 May 2018 11:53:41 +0200
+
 libnative-platform-java (0.14-3) unstable; urgency=medium
 
   * d/control:


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,15 @@ Priority: optional
 Maintainer: Debian Java Maintainers 
<pkg-java-maintain...@lists.alioth.debian.org>
 Uploaders: Kai-Chung Yan <seamli...@gmail.com>
 Build-Depends: debhelper (>= 11),
-               default-jdk-headless | default-jdk (>= 1:1.7),
+               default-jdk-headless (>= 2:1.8) | default-jdk (>= 2:1.8),
                default-jdk-doc,
                javahelper,
                libncurses5-dev,
                maven-repo-helper (>= 1.5~)
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/libnative-platform-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libnative-platform-java
 Homepage: https://github.com/adammurdoch/native-platform
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libnative-platform-java.git
-Vcs-Browser: 
https://anonscm.debian.org/cgit/pkg-java/libnative-platform-java.git
 
 Package: libnative-platform-java
 Architecture: all


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,3 @@ override_dh_auto_build:
 override_dh_auto_clean:
        dh_auto_clean
        $(RM) -r debian/out
-
-get-orig-source:
-       uscan --download-current-version --force-download --repack 
--compression xz
\ No newline at end of file


=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 version=3
-opts=uversionmangle=s/(\d)[\.\-]?((?:rc|RC|pre)(?:\.|-)?\d+(?:-\d+)?)$/$1~$2/,dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/,
 \
+opts=repack,compression=xz,uversionmangle=s/(\d)[\.\-]?((?:rc|RC|pre)(?:\.|-)?\d+(?:-\d+)?)$/$1~$2/,dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/,
 \
  https://github.com/adammurdoch/native-platform/tags \
  .*/archive/(?:upstream/)?(?:v||version-|release-|X|R|r)(\d\S*)\.tar\.gz
 # Bart Martens <ba...@debian.org>  Sat, 04 May 2013 09:06:25 +0000



View it on GitLab: 
https://salsa.debian.org/java-team/libnative-platform-java/compare/45dfe1016f8895987a089243041180f4c88905b3...dce7631dfb2e78b994e84b4f523db64f42f1b0c9

---
View it on GitLab: 
https://salsa.debian.org/java-team/libnative-platform-java/compare/45dfe1016f8895987a089243041180f4c88905b3...dce7631dfb2e78b994e84b4f523db64f42f1b0c9
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to