[electric] 02/03: Readd alternative dependency on java6-runtime

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository electric.

commit 2ffccf46536d84357114bae05b6511d0d11d7f9e
Author: Markus Koschany <apo at gambaru.de>
Date:   Wed Aug 12 13:19:57 2015 +0200

    Readd alternative dependency on java6-runtime
---
 debian/changelog | 1 -
 debian/control   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65ee7ad..0c91b3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,6 @@ electric (9.06+dfsg-1) unstable; urgency=medium
   * debian/control: Add all build-dependencies only to Build-Depends.
   * Install ElectricIcon64x64.png icon. Drop debian/icons directory.
     Convert ElectricIcon64x64.png with imagemagick to electric.xpm at build-time.
-  * Electric 9.06 requires Java7. Drop alternative dependency on java6-runtime.
   * Update copyright years.
 
  -- Markus Koschany <apo at gambaru.de>  Wed, 12 Aug 2015 13:15:54 +0200
diff --git a/debian/control b/debian/control
index b5a83a3..c5e4efe 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Homepage: http://www.staticfreesoft.com/productsFree.html
 Package: electric
 Architecture: all
 Depends:
- default-jre | java7-runtime,
+ default-jre | java7-runtime | java6-runtime,
  java-wrappers,
  ${java:Depends},
  ${misc:Depends}

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