[libkml] 02/06: Revert "Switch to headless variant for default-jdk dependency."

Bas Couwenberg sebastic at debian.org
Thu Aug 25 10:16:02 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libkml.

commit 332d66acaf514ef8074fab66e682557c5d445786
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Aug 25 11:11:25 2016 +0200

    Revert "Switch to headless variant for default-jdk dependency."
    
    This reverts commit d5ddc5076774c3001d5736c5a0cec00f85dd5854.
    
    Conflicts:
    	debian/changelog
---
 debian/changelog | 1 -
 debian/control   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 517b27f..190dbe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 libkml (1.3.0-3) UNRELEASED; urgency=medium
 
-  * Switch to headless variant for default-jdk dependency.
   * Fix typo in dh_python2 override.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 16 Aug 2016 11:55:31 +0200
diff --git a/debian/control b/debian/control
index 65b5e23..e108333 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python,
                cmake,
-               default-jdk-headless,
+               default-jdk,
                libboost-dev,
                libcurl4-gnutls-dev | libcurl-ssl-dev,
                libexpat1-dev,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git



More information about the Pkg-grass-devel mailing list