openjdk team mailing list archive

[Emmanuel Bourg <ebourg@xxxxxxxxxx>]

Emmanuel Bourg has proposed merging lp:~ebourg/openjdk/openjdk8 into lp:~openjdk/openjdk/openjdk8.

Requested reviews:
  Matthias Klose (doko)

For more details, see:
https://code.launchpad.net/~ebourg/openjdk/openjdk8/+merge/227819
-- 
https://code.launchpad.net/~ebourg/openjdk/openjdk8/+merge/227819
Your team OpenJDK is subscribed to branch lp:~openjdk/openjdk/openjdk8.

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-17 10:56:17 +0000
+++ debian/changelog	2014-07-22 19:55:11 +0000
@@ -1,11 +1,16 @@
 openjdk-8 (8u20~b20-3) UNRELEASED; urgency=medium
 
+  [ Matthias Klose ]
   * Update toplevel configury to recognize zero archs alpha, mips*,
     m68k, sh4.
   * Update kfreebsd-support patches (Steven Chamberlain).
   * Fix an uninitialized memory issue in adlc (Fridrich Strba).
   * Move libjavagtk into the -jre package.
 
+  [ Emmanuel Bourg ]
+  * debian/rules: Derive the update version and the build number
+    from the package version.
+
  -- Matthias Klose <doko@xxxxxxxxxx>  Sun, 13 Jul 2014 15:05:50 +0200
 
 openjdk-8 (8u20~b20-2) experimental; urgency=medium

=== modified file 'debian/rules'
--- debian/rules	2014-07-17 10:56:17 +0000
+++ debian/rules	2014-07-22 19:55:11 +0000
@@ -70,8 +70,8 @@
 endif
 jvmver		= 1.8.0
 shortver	= 8
-updatever	= 20
-buildver	= b20
+updatever       = $(shell echo $(PKGVERSION) | sed -n 's/.*u\([0-9]\+\).*/\1/p')
+buildver        = $(shell echo $(PKGVERSION) | sed -n 's/.*\(b[0-9]\+\).*/\1/p')
 ifneq (,$(DEB_HOST_MULTIARCH))
   jdirname	= java-$(shortver)-$(origin)-$(DEB_HOST_ARCH)
   jdiralias	= java-$(jvmver)-$(origin)-$(DEB_HOST_ARCH)