Updates changelog and control files for deb package.

3 files changed, 18 insertions, 4 deletions

diff --git a/resources/install/debian/changelog.tmpl b/resources/install/debian/changelog.tmpl
index 1528681..1139687 100644
--- a/resources/install/debian/changelog.tmpl
+++ b/resources/install/debian/changelog.tmpl
@@ -1,10 +1,24 @@
 _PACKAGE_NAME_ (_VERSION_) unstable; urgency=low
 
   * Updates upstream.
+  * Now depends libjitsi package.
   * Fixes BundleException: Unresolved constraint in bundle propertieseditor. (Closes: #736773)
+  * Fixes commons lang missing felix manifests. (Closes: #736773)
 
  -- Damian Minkov <damencho@jitsi.org>  _DATE_
 
+jitsi (2.4.4997-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Upload to unstable.
+  * debian/patches/json.patch: Update paths to json-simple.jar since
+    libjson-simple-java 1.1.1-2 dropped the compatibility symlink. (Closes:
+    #747789)
+  * debian/control: Bump (Build-)Depends on libjson-simple-java to >= 1.1.1.
+    The name got changed to json-simple.jar starting with 1.1.1.
+
+ -- Sebastian Ramacher <sramacher@debian.org>  Tue, 20 May 2014 22:02:47 +0200
+
 jitsi (2.4.4997-1) unstable; urgency=low
 
   * Updates upstream.
diff --git a/resources/install/debian/control-src.tmpl b/resources/install/debian/control-src.tmpl
index 30256db..de41103 100644
--- a/resources/install/debian/control-src.tmpl
+++ b/resources/install/debian/control-src.tmpl
@@ -40,7 +40,7 @@ Build-Depends: debhelper (>= 9), javahelper,
                libhttpcore-java,
                libhttpmime-java,
                libhttpclient-java,
-               libjson-simple-java,
+               libjson-simple-java (>= 1.1.1),
                libdbus-java,
                libeasymock-java,
                libxt-dev,
@@ -64,7 +64,7 @@ Build-Depends: debhelper (>= 9), javahelper,
                glassfish-mail,
                libbcpkix-java,
                libjcalendar-java
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 
 Package: _PACKAGE_NAME_
 Architecture: all
@@ -93,7 +93,7 @@ Depends: ${misc:Depends},
          libbcprov-java,
          libjna-java,
          libjgoodies-forms-java,
-         libjson-simple-java,
+         libjson-simple-java (>= 1.1.1),
          libjcalendar-java
 Recommends: ${java:Recommends}
 Description: VoIP and Instant Messaging client
diff --git a/resources/install/debian/control.tmpl b/resources/install/debian/control.tmpl
index becaa6a..2f663b3 100644
--- a/resources/install/debian/control.tmpl
+++ b/resources/install/debian/control.tmpl
@@ -57,7 +57,7 @@ Build-Depends: debhelper (>= 9), javahelper,
                glassfish-activation,
                glassfish-mail,
                libbcpkix-java
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 
 Package: _PACKAGE_NAME_
 Architecture: i386 amd64