← Back to team overview

openjdk team mailing list archive

[Merge] ~openjdk/ubuntu/+source/openjdk/+git/openjdk:openjdk-11-fix-breaks into ~openjdk/ubuntu/+source/openjdk/+git/openjdk:openjdk-11

 

Tiago Stürmer Daitx has proposed merging ~openjdk/ubuntu/+source/openjdk/+git/openjdk:openjdk-11-fix-breaks into ~openjdk/ubuntu/+source/openjdk/+git/openjdk:openjdk-11.

Commit message:
Properly generate Breaks: rules for bionic (fix typo)

Requested reviews:
  Matthias Klose (doko)

For more details, see:
https://code.launchpad.net/~openjdk/ubuntu/+source/openjdk/+git/openjdk/+merge/370796

The debian/rules logic for selecting the right Breaks: has a typo which will prevent openjdk from selecting the right Breaks rules in Bionic.
-- 
Your team OpenJDK is subscribed to branch ~openjdk/ubuntu/+source/openjdk/+git/openjdk:openjdk-11.
diff --git a/debian/rules b/debian/rules
index f02df7b..0966d64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -691,12 +691,12 @@ else
 endif
 
 jrehl_breaks = clojure1.8 (<= 1.8.0-7ubuntu1~),
-ifneq (,$(filter $(distrel),buster bionc cosmic disco eoan))
+ifneq (,$(filter $(distrel),buster bionic cosmic disco eoan))
   jrehl_breaks += \
 	jetty9 (<< 9.4.15-1~), netbeans (<< 10.0-3~), visualvm (<< 1.4.2-2~), \
 	eclipse-platform (<< 3.8.1-11), libequinox-osgi-java (<< 3.9.1),
 endif
-ifneq (,$(filter $(distrel),bionc cosmic disco eoan))
+ifneq (,$(filter $(distrel),bionic cosmic disco eoan))
   jrehl_breaks += \
 	tomcat8 (<< 8.5.39-1ubuntu1~),
 endif

Follow ups