------------------------------------------------------------
revno: 626
committer: Matthias Klose <[email protected]>
branch nick: openjdk7
timestamp: Tue 2019-03-26 19:01:08 +0100
message:
   - update the control file
modified:
  changelog
  control
  rules


--
lp:~openjdk/openjdk/openjdk7
https://code.launchpad.net/~openjdk/openjdk/openjdk7

Your team Debian Java Maintainers is subscribed to branch 
lp:~openjdk/openjdk/openjdk7.
To unsubscribe from this branch go to 
https://code.launchpad.net/~openjdk/openjdk/openjdk7/+edit-subscription
=== modified file 'changelog'
--- changelog	2019-03-26 17:15:32 +0000
+++ changelog	2019-03-26 18:01:08 +0000
@@ -36,7 +36,7 @@
   * Bump standards version.
   * Fix lintian warnings.
 
- -- Matthias Klose <[email protected]>  Tue, 26 Mar 2019 17:44:33 +0100
+ -- Matthias Klose <[email protected]>  Tue, 26 Mar 2019 18:54:42 +0100
 
 openjdk-7 (7u181-2.6.14-2) experimental; urgency=medium
 

=== modified file 'control'
--- control	2019-03-26 17:15:32 +0000
+++ control	2019-03-26 18:01:08 +0000
@@ -11,8 +11,8 @@
   xfwm4, dbus-x11, x11-xkb-utils,
   fastjar (>= 2:0.96-0ubuntu2), ant, ant-optional,
   libpulse-dev (>= 0.9.12), mauve, dh-autoreconf, quilt,
-  libtool, g++-6,
-   ecj-gcj [amd64 armel arm64 armhf hppa i386 ia64 powerpc powerpcspe ppc64 ppc64el m68k mipsel sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64], gcj-jdk [amd64 armel arm64 armhf hppa i386 ia64 powerpc powerpcspe ppc64 ppc64el m68k mipsel sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64], openjdk-7-jdk (>= 6b18) [alpha mips mips64 mips64el],
+  libtool, g++-8,
+   openjdk-7-jdk (>= 6b18) [alpha mips mips64 mips64el amd64 armel arm64 armhf hppa i386 ia64 powerpc powerpcspe ppc64 ppc64el m68k mipsel sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64],
   libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libasound2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, liblcms2-dev, libxinerama-dev, libkrb5-dev, xsltproc, libcups2-dev, libpcsclite-dev, librhino-java (>= 1.7R3~), fonts-ipafont-mincho,
   libffi-dev, 
   zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev, libsctp-dev [linux-any],
@@ -177,19 +177,3 @@
  have a Hotspot VM.
  .
  The VM is started with the option `-zero'. See the README.Debian for details.
-
-Package: openjdk-7-tests
-Architecture: alpha amd64 armel armhf arm64 i386 ia64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64
-Multi-Arch: same
-Priority: optional
-Pre-Depends: ${dpkg:Depends}
-Suggests: jtreg
-Description: OpenJDK Development Kit (JDK) documentation
- OpenJDK is a development environment for building applications,
- applets, and components using the Java programming language.
- .
- This package contains the jtreg test results from the suites ran
- during the package build.
- .
- The packages are built using the IcedTea build support and patches
- from the IcedTea project.

=== modified file 'rules'
--- rules	2019-03-26 17:15:32 +0000
+++ rules	2019-03-26 18:01:08 +0000
@@ -253,14 +253,18 @@
   export CC = gcc-4.9
   export CXX = g++-4.9
   GCJ_SUFFIX = -4.9
-else ifneq (,$(filter $(distrel),stretch xenial))
+else ifneq (,$(filter $(distrel),xenial))
   export CC = gcc-5
   export CXX = g++-5
   GCJ_SUFFIX = -5
-else
+else ifneq (,$(filter $(distrel),stretch))
   export CC = gcc-6
   export CXX = g++-6
   GCJ_SUFFIX = -6
+else
+  export CC = gcc-8
+  export CXX = g++-8
+  GCJ_SUFFIX = -8
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf))
@@ -572,10 +576,12 @@
   bd_gcc = g++-4.8,
 else ifneq (,$(filter $(distrel), jessie))
   bd_gcc = g++-4.9,
-else ifneq (,$(filter $(distrel), stretch xenial))
+else ifneq (,$(filter $(distrel), xenial))
   bd_gcc = g++-5,
-else
+else ifneq (,$(filter $(distrel), stretch))
   bd_gcc = g++-6,
+else
+  bd_gcc = g++-8,
 endif
 bd_syslibs = \
 	zlib1g-dev, libattr1-dev, libpng-dev, libjpeg-dev, libgif-dev,

__
This is the maintainer address of Debian's Java team
<https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
 Please use
[email protected] for discussions and questions.

Reply via email to