[Pkg-fedora-ds-maintainers] 389-console: Changes to 'master'

[Timo Aaltonen]

 debian/389-console.lintian-overrides |    2 +-
 debian/changelog                     |    9 +++++++++
 debian/control                       |    1 +
 debian/rules                         |    4 ++--
 4 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit c7f03ba00db17c7944494d08eab0e8c39db50ae8
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Mar 9 09:12:13 2017 +0200

    releasing package 389-console version 1.1.18-2

diff --git a/debian/changelog b/debian/changelog
index 7295376..39fc1bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-389-console (1.1.18-2) UNRELEASED; urgency=medium
+389-console (1.1.18-2) unstable; urgency=medium
 
   * rules: Actually install the jar instead of overwriting it with a symlink.
     (Closes: #857209)
   * control: Depend on default-jre. (Closes: #795894)
   * lintian: Fix codeless-jar override.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Thu, 09 Mar 2017 08:46:47 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 09 Mar 2017 09:11:43 +0200
 
 389-console (1.1.18-1) unstable; urgency=medium
 

commit 0db68c56c8635773e5035027e89b05b1d3f7684c
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Mar 9 09:11:40 2017 +0200

    lintian: Fix codeless-jar override.

diff --git a/debian/389-console.lintian-overrides b/debian/389-console.lintian-overrides
index 505eed2..6425dec 100644
--- a/debian/389-console.lintian-overrides
+++ b/debian/389-console.lintian-overrides
@@ -1,3 +1,3 @@
-codeless-jar usr/share/java/389-console-1.1.7_en.jar
+codeless-jar usr/share/java/389-console-*.jar
 missing-classpath libidm-console-framework-java
 binary-without-manpage usr/bin/389-console
diff --git a/debian/changelog b/debian/changelog
index bb95f28..7295376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@
   * rules: Actually install the jar instead of overwriting it with a symlink.
     (Closes: #857209)
   * control: Depend on default-jre. (Closes: #795894)
+  * lintian: Fix codeless-jar override.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 09 Mar 2017 08:46:47 +0200
 

commit 06d15ba0f067c791bd8c3ccd25cdbd4160c94338
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Mar 9 09:06:39 2017 +0200

    control: Depend on default-jre. (Closes: #795894)

diff --git a/debian/changelog b/debian/changelog
index 3f98b04..bb95f28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@
 
   * rules: Actually install the jar instead of overwriting it with a symlink.
     (Closes: #857209)
+  * control: Depend on default-jre. (Closes: #795894)
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 09 Mar 2017 08:46:47 +0200
 
diff --git a/debian/control b/debian/control
index 5abf9bd..a9329ad 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-fedora-ds/389-console.git
 Package: 389-console
 Architecture: all
 Depends: ${misc:Depends},
+ default-jre,
  libidm-console-framework-java,
 Description: 389 Management Console
  A Java based remote management console used for managing 389

commit 82ddd38037ff1b7a82b83b4244b708720369eca1
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Mar 9 09:05:25 2017 +0200

    rules: Actually install the jar instead of overwriting it with a symlink. (Closes: #857209)

diff --git a/debian/changelog b/debian/changelog
index d6af27d..3f98b04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+389-console (1.1.18-2) UNRELEASED; urgency=medium
+
+  * rules: Actually install the jar instead of overwriting it with a symlink.
+    (Closes: #857209)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 09 Mar 2017 08:46:47 +0200
+
 389-console (1.1.18-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index b2bf688..88ee503 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,8 @@ override_dh_auto_install:
 	mkdir -p $(CURDIR)/debian/$(PKG)/usr/share/java/
 	mkdir -p $(CURDIR)/debian/$(PKG)/usr/share/man/man8
 	mkdir -p $(CURDIR)/debian/$(PKG)/usr/bin
-	install -m 644 $(BUILT_DIR)/*.jar \
-		$(CURDIR)/debian/$(PKG)/usr/share/java/
+	install -m 644 $(BUILT_DIR)/$(PKG)_$(CONSOLELANG).jar \
+		$(CURDIR)/debian/$(PKG)/usr/share/java/$(PKG)-$(UPSTREAM_VERSION)_$(CONSOLELANG).jar
 	install -m 755 $(BUILT_DIR)/$(PKG) \
 		$(CURDIR)/debian/$(PKG)/usr/bin
 	install -m 644 $(BUILT_DIR)/usr/share/man/man8/* \