Conrol: tags -1 + patch pending Dear maintainer,
I've prepared an NMU for jitsi (versioned as 2.4.4997-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru jitsi-2.4.4997/debian/changelog jitsi-2.4.4997/debian/changelog
--- jitsi-2.4.4997/debian/changelog 2014-04-01 03:52:23.000000000 +0200
+++ jitsi-2.4.4997/debian/changelog 2014-05-20 22:02:48.000000000 +0200
@@ -1,3 +1,15 @@
+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 <sramac...@debian.org> Tue, 20 May 2014 22:02:47 +0200
+
jitsi (2.4.4997-1.1) experimental; urgency=low
* Non-maintainer upload.
diff -Nru jitsi-2.4.4997/debian/control jitsi-2.4.4997/debian/control
--- jitsi-2.4.4997/debian/control 2014-04-01 03:41:26.000000000 +0200
+++ jitsi-2.4.4997/debian/control 2014-05-20 21:33:16.000000000 +0200
@@ -38,7 +38,7 @@
libhttpcore-java,
libhttpmime-java,
libhttpclient-java,
- libjson-simple-java,
+ libjson-simple-java (>= 1.1.1),
libdbus-java,
libeasymock-java,
libxt-dev,
@@ -89,7 +89,7 @@
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 -Nru jitsi-2.4.4997/debian/patches/json.patch jitsi-2.4.4997/debian/patches/json.patch
--- jitsi-2.4.4997/debian/patches/json.patch 1970-01-01 01:00:00.000000000 +0100
+++ jitsi-2.4.4997/debian/patches/json.patch 2014-05-20 21:33:56.000000000 +0200
@@ -0,0 +1,45 @@
+Description: Fix name of json-simple.jar
+ libjson-simple-java 1.1.1-2 no longer ships the compatibility symlink.
+Bug-Debian: http://bugs.debian.org/747789
+Last-Update: 2014-05-20
+
+--- jitsi-2.4.4997.orig/resources/install/build.xml
++++ jitsi-2.4.4997/resources/install/build.xml
+@@ -2659,7 +2659,7 @@
+ <symlink resource="/usr/share/java/org.apache.felix.framework.jar"
+ overwrite="true"
+ link="${debian.src.dir}/lib/src/libjitsi/lib/felix.jar"/>
+- <symlink resource="/usr/share/java/json_simple.jar"
++ <symlink resource="/usr/share/java/json-simple.jar"
+ overwrite="true"
+ link="${debian.src.dir}/lib/src/libjitsi/lib"/>
+
+@@ -3006,7 +3006,7 @@ org.jitsi.bccontrib.util"/>
+ tofile="${debian.src.dir}/lib/native/linux/libjdic_misc.so"/>
+
+ <!-- json -->
+- <symlink resource="/usr/share/java/json_simple.jar"
++ <symlink resource="/usr/share/java/json-simple.jar"
+ overwrite="true"
+ link="${debian.src.dir}/lib/installer-exclude/json-simple-1.1.1.jar"/>
+
+@@ -3430,8 +3430,8 @@ org.jitsi.bccontrib.util"/>
+ </unzip>
+ <delete file="${debian.bundles.dest}/json.jar"/>
+ <mkdir dir="${debian.bundles.dest}/json.jar/META-INF"/>
+- <symlink resource="../../../../share/java/json_simple.jar"
+- link="${debian.bundles.dest}/json.jar/json_simple.jar"/>
++ <symlink resource="../../../../share/java/json-simple.jar"
++ link="${debian.bundles.dest}/json.jar/json-simple.jar"/>
+ <manifest
+ file="${debian.bundles.dest}/json.jar/META-INF/MANIFEST.MF">
+ <attribute name="Bundle-Name" value="JSON.simple"/>
+@@ -3443,7 +3443,7 @@ org.jitsi.bccontrib.util"/>
+ <attribute name="System-Bundle" value="yes"/>
+ <attribute name="Export-Package"
+ value="org.json.simple,org.json.simple.parser"/>
+- <attribute name="Bundle-ClassPath" value=".,json_simple.jar"/>
++ <attribute name="Bundle-ClassPath" value=".,json-simple.jar"/>
+ </manifest>
+ <delete dir="${debian.bundles.dest}/META-INF"/>
+ </target>
diff -Nru jitsi-2.4.4997/debian/patches/series jitsi-2.4.4997/debian/patches/series
--- jitsi-2.4.4997/debian/patches/series 2014-04-01 03:40:21.000000000 +0200
+++ jitsi-2.4.4997/debian/patches/series 2014-05-20 21:29:22.000000000 +0200
@@ -2,3 +2,4 @@
remove-hflip
guava-update
libav10.patch
+json.patch
signature.asc
Description: Digital signature
