[openjfx9] 01/11: Renamed the package to openjfx9
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Oct 11 23:05:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjfx9.
commit 39659c7decccc5143cf9a545f162643948874ec6
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sat Oct 7 01:26:02 2017 +0200
Renamed the package to openjfx9
---
debian/changelog | 8 ++++++++
debian/control | 30 ++++++++++++++--------------
debian/libopenjfx-java-doc.doc-base | 9 ---------
debian/libopenjfx-java-doc.install | 2 --
debian/libopenjfx9-java-doc.doc-base | 9 +++++++++
debian/libopenjfx9-java-doc.install | 2 ++
debian/orig-tar.sh | 2 +-
debian/rules | 38 ++++++++++++++++++------------------
debian/watch | 3 ++-
9 files changed, 56 insertions(+), 47 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 632bf10..e8bd776 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openjfx9 (9~b181-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ - Renamed the package to openjfx9
+
+ -- Emmanuel Bourg <ebourg at apache.org> Sat, 07 Oct 2017 01:01:42 +0200
+
openjfx (8u141-b14-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 5bbf21f..62dc85d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: openjfx
+Source: openjfx9
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
@@ -42,23 +42,23 @@ Build-Depends: antlr3,
x11proto-core-dev,
x11proto-xf86vidmode-dev
Standards-Version: 4.1.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/openjfx.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/openjfx.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/openjfx9.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/openjfx9.git
Homepage: http://openjdk.java.net/projects/openjfx/
-Package: openjfx
+Package: openjfx9
Architecture: any
Depends: libopenjfx-java, openjdk-8-jre, ${misc:Depends}
-Description: JavaFX/OpenJFX 8 - Rich client application platform for Java
+Description: JavaFX/OpenJFX 9 - Rich client application platform for Java
JavaFX/OpenJFX is a set of graphics and media APIs that enables Java developers
to design, create, test, debug, and deploy rich client applications that
operate consistently across diverse platforms.
-Package: libopenjfx-java
+Package: libopenjfx9-java
Architecture: all
-Depends: libopenjfx-jni, ${misc:Depends}
+Depends: libopenjfx9-jni, ${misc:Depends}
Suggests: openjfx
-Description: JavaFX/OpenJFX 8 - Rich client application platform for Java (Java libraries)
+Description: JavaFX/OpenJFX 9 - Rich client application platform for Java (Java libraries)
JavaFX/OpenJFX is a set of graphics and media APIs that enables Java developers
to design, create, test, debug, and deploy rich client applications that
operate consistently across diverse platforms.
@@ -67,32 +67,32 @@ Description: JavaFX/OpenJFX 8 - Rich client application platform for Java (Java
the JavaFX classes to the default classpath automatically. The integration
with the JRE is provided by the openjfx package.
-Package: libopenjfx-jni
+Package: libopenjfx9-jni
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: JavaFX/OpenJFX 8 - Rich client application platform for Java (native libraries)
+Description: JavaFX/OpenJFX 9 - Rich client application platform for Java (native libraries)
JavaFX/OpenJFX is a set of graphics and media APIs that enables Java developers
to design, create, test, debug, and deploy rich client applications that
operate consistently across diverse platforms.
.
This package contains the native libraries for libopenjfx-java.
-Package: libopenjfx-java-doc
+Package: libopenjfx9-java-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Suggests: libopenjfx-java, openjdk-8-doc
-Description: JavaFX/OpenJFX 8 - Rich client application platform for Java (Javadoc)
+Suggests: libopenjfx9-java, openjdk-9-doc
+Description: JavaFX/OpenJFX 9 - Rich client application platform for Java (Javadoc)
JavaFX/OpenJFX is a set of graphics and media APIs that enables Java developers
to design, create, test, debug, and deploy rich client applications that
operate consistently across diverse platforms.
.
This package contains the API documentation for libopenjfx-java.
-Package: openjfx-source
+Package: openjfx9-source
Architecture: all
Depends: ${misc:Depends}
-Description: JavaFX/OpenJFX 8 - Rich client application platform for Java (sources)
+Description: JavaFX/OpenJFX 9 - Rich client application platform for Java (sources)
JavaFX/OpenJFX is a set of graphics and media APIs that enables Java developers
to design, create, test, debug, and deploy rich client applications that
operate consistently across diverse platforms.
diff --git a/debian/libopenjfx-java-doc.doc-base b/debian/libopenjfx-java-doc.doc-base
deleted file mode 100644
index 87cd3fb..0000000
--- a/debian/libopenjfx-java-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: libopenjfx-java-doc
-Title: API Javadoc for OpenJFX 8
-Author: Oracle Inc
-Abstract: This is the API Javadoc provided for the libopenjfx-java library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libopenjfx-java/api/index.html
-Files: /usr/share/doc/libopenjfx-java/api/*
diff --git a/debian/libopenjfx-java-doc.install b/debian/libopenjfx-java-doc.install
deleted file mode 100644
index b476e4e..0000000
--- a/debian/libopenjfx-java-doc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-
-build/javadoc/* usr/share/doc/libopenjfx-java/api
diff --git a/debian/libopenjfx9-java-doc.doc-base b/debian/libopenjfx9-java-doc.doc-base
new file mode 100644
index 0000000..f424a64
--- /dev/null
+++ b/debian/libopenjfx9-java-doc.doc-base
@@ -0,0 +1,9 @@
+Document: libopenjfx-java-doc
+Title: API Javadoc for OpenJFX 8
+Author: Oracle Inc
+Abstract: This is the API Javadoc provided for the libopenjfx9-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libopenjfx9-java/api/index.html
+Files: /usr/share/doc/libopenjfx9-java/api/*
diff --git a/debian/libopenjfx9-java-doc.install b/debian/libopenjfx9-java-doc.install
new file mode 100644
index 0000000..f05cd8a
--- /dev/null
+++ b/debian/libopenjfx9-java-doc.install
@@ -0,0 +1,2 @@
+
+build/javadoc/* usr/share/doc/libopenjfx9-java/api
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 01abb27..ef4e3bb 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -6,7 +6,7 @@ DIR=rt-$VERSION
rm $3
-wget http://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/$VERSION.tar.gz
+wget http://hg.openjdk.java.net/openjfx/9-dev/rt/archive/$VERSION.tar.gz
tar -xf $VERSION.tar.gz
rm $VERSION.tar.gz
diff --git a/debian/rules b/debian/rules
index 8ca284a..0d9301f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), s390x))
endif
export JAVA_HOME = /usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)
-export OPENJFX_HOME = /usr/share/java/openjfx
+export OPENJFX_HOME = /usr/share/java/openjfx9
export QT_SELECT = qt5
jvm_arch_map = \
@@ -56,31 +56,31 @@ override_dh_install-arch:
dh_install -a
gzip -r -v -n --best build/sdk/man/
- dh_install -popenjfx build/sdk/bin/* $(JAVA_HOME)/bin
- dh_install -popenjfx build/sdk/man $(JAVA_HOME)
- dh_link -popenjfx $(JAVA_HOME)/bin/javafxpackager /usr/bin/javafxpackager
- dh_link -popenjfx $(JAVA_HOME)/bin/javapackager /usr/bin/javapackager
- dh_link -popenjfx $(JAVA_HOME)/man/man1/javafxpackager.1.gz /usr/share/man/man1/javafxpackager.1.gz
- dh_link -popenjfx $(JAVA_HOME)/man/man1/javapackager.1.gz /usr/share/man/man1/javapackager.1.gz
-
- dh_link -popenjfx $(OPENJFX_HOME)/jre/lib/jfxswt.jar $(JAVA_HOME)/jre/lib/jfxswt.jar
- dh_link -popenjfx $(OPENJFX_HOME)/jre/lib/javafx.properties $(JAVA_HOME)/jre/lib/javafx.properties
- dh_link -popenjfx $(OPENJFX_HOME)/jre/lib/ext/jfxrt.jar $(JAVA_HOME)/jre/lib/ext/jfxrt.jar
- dh_link -popenjfx $(OPENJFX_HOME)/lib/ant-javafx.jar $(JAVA_HOME)/lib/ant-javafx.jar
- dh_link -popenjfx $(OPENJFX_HOME)/lib/javafx-mx.jar $(JAVA_HOME)/lib/javafx-mx.jar
+ dh_install -popenjfx9 build/sdk/bin/* $(JAVA_HOME)/bin
+ dh_install -popenjfx9 build/sdk/man $(JAVA_HOME)
+ dh_link -popenjfx9 $(JAVA_HOME)/bin/javafxpackager /usr/bin/javafxpackager
+ dh_link -popenjfx9 $(JAVA_HOME)/bin/javapackager /usr/bin/javapackager
+ dh_link -popenjfx9 $(JAVA_HOME)/man/man1/javafxpackager.1.gz /usr/share/man/man1/javafxpackager.1.gz
+ dh_link -popenjfx9 $(JAVA_HOME)/man/man1/javapackager.1.gz /usr/share/man/man1/javapackager.1.gz
+
+ dh_link -popenjfx9 $(OPENJFX_HOME)/jre/lib/jfxswt.jar $(JAVA_HOME)/jre/lib/jfxswt.jar
+ dh_link -popenjfx9 $(OPENJFX_HOME)/jre/lib/javafx.properties $(JAVA_HOME)/jre/lib/javafx.properties
+ dh_link -popenjfx9 $(OPENJFX_HOME)/jre/lib/ext/jfxrt.jar $(JAVA_HOME)/jre/lib/ext/jfxrt.jar
+ dh_link -popenjfx9 $(OPENJFX_HOME)/lib/ant-javafx.jar $(JAVA_HOME)/lib/ant-javafx.jar
+ dh_link -popenjfx9 $(OPENJFX_HOME)/lib/javafx-mx.jar $(JAVA_HOME)/lib/javafx-mx.jar
ls -l build/sdk/rt/lib
- dh_install -plibopenjfx-jni build/sdk/rt/lib/*/*.so $(JAVA_HOME)/jre/lib/$(jvm_arch)
+ dh_install -plibopenjfx9-jni build/sdk/rt/lib/*/*.so $(JAVA_HOME)/jre/lib/$(jvm_arch)
override_dh_install-indep:
dh_install -i
- dh_install -plibopenjfx-java build/sdk/lib $(OPENJFX_HOME)
- dh_install -plibopenjfx-java build/sdk/rt/lib/*.jar $(OPENJFX_HOME)/jre/lib
- dh_install -plibopenjfx-java build/sdk/rt/lib/*.properties $(OPENJFX_HOME)/jre/lib
- dh_install -plibopenjfx-java build/sdk/rt/lib/ext $(OPENJFX_HOME)/jre/lib
+ dh_install -plibopenjfx9-java build/sdk/lib $(OPENJFX_HOME)
+ dh_install -plibopenjfx9-java build/sdk/rt/lib/*.jar $(OPENJFX_HOME)/jre/lib
+ dh_install -plibopenjfx9-java build/sdk/rt/lib/*.properties $(OPENJFX_HOME)/jre/lib
+ dh_install -plibopenjfx9-java build/sdk/rt/lib/ext $(OPENJFX_HOME)/jre/lib
- dh_install -popenjfx-source build/javafx-src.zip $(JAVA_HOME)
+ dh_install -popenjfx9-source build/javafx-src.zip $(JAVA_HOME)
get-orig-source:
uscan --download-current-version --force-download --rename
diff --git a/debian/watch b/debian/watch
index 6419e24..b3909ac 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-http://java.debian.net/checkjdk.php .*/jdk(\d(?:u\d+)-b\d+).tar.gz debian debian/orig-tar.sh
+opts=uversionmangle=s/(\d+)\+(\d+)/$1~b$2/ \
+http://java.debian.net/checkjdk.php .*/jdk-(9(?:u\d+)?(?:\+|-b)\d+).tar.gz debian debian/orig-tar.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx9.git
More information about the pkg-java-commits
mailing list