This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openjdk-8.
commit 095fd6d7f69d3af29020f128aef20f2ad238c9f7 Author: Emmanuel Bourg <[email protected]> Date: Sun Mar 30 21:42:27 2014 +0200 Drop support for etch --- debian/rules | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/debian/rules b/debian/rules index 9e28069..67ec791 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,7 @@ ifeq (,$(filter $(distrel),lenny jaunty intrepid hardy)) shark_archs = endif -ifneq (,$(filter $(distrel),hardy intrepid jaunty karmic lucid maverick natty oneiric precise lenny etch squeeze wheezy)) +ifneq (,$(filter $(distrel),hardy intrepid jaunty karmic lucid maverick natty oneiric precise lenny squeeze wheezy)) is_default = no else is_default = yes @@ -636,10 +636,9 @@ else bd_syslibs += libpng-dev, libjpeg8-dev, endif bd_syslibs += \ - libgif-dev$(if $(filter $(distrel),etch), | libungif4-dev), + libgif-dev, bd_openjdk = \ - libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, \ - $(if $(filter $(distrel), etch hardy),libcupsys2-dev,libcups2-dev), \ + libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, \ libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, \ libxinerama-dev, xsltproc, @@ -708,8 +707,7 @@ endif #endif dlopen_hl_depends = \ - $(if $(filter $(distrel), etch),libcupsys2,libcups2), \ - liblcms2-2, \ + libcups2, liblcms2-2, \ $(if $(findstring jpeg8, $(bd_syslibs)),libjpeg8,libjpeg62) ifneq ($(with_nss),no) ifneq (,$(filter $(distrel),lenny squeeze natty maverick lucid karmic hardy)) @@ -745,9 +743,7 @@ ifeq ($(distribution),Ubuntu) endif endif -ifneq (,$(filter $(distrel),etch)) - core_fonts = ttf-dejavu -else ifneq (,$(filter $(distrel),lenny hardy intrepid jaunty karmic)) +ifneq (,$(filter $(distrel),lenny hardy intrepid jaunty karmic)) core_fonts = ttf-dejavu-core else ifneq (,$(filter $(distrel),squeeze wheezy lucid maverick natty oneiric precise quantal raring)) core_fonts = ttf-dejavu-extra -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
