From 7aeb4abae659044f5b8911da3ebf5a5ef91cdb20 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Mon, 15 Sep 2014 12:00:29 +0300
Subject: [PATCH] Removes gdata dependency and google contacts plugin, when
 building debian source package.

---
 resources/install/build.xml                   | 13 +++++-----
 .../install/debian/README.embedded-libraries  |  6 -----
 resources/install/debian/changelog.tmpl       |  1 +
 resources/install/debian/copyright            |  5 ----
 resources/install/debian/patches/guava-update | 14 -----------
 .../install/debian/patches/removes-gdata-deps | 25 +++++++++++++++++++
 resources/install/debian/patches/series       |  2 +-
 7 files changed, 34 insertions(+), 32 deletions(-)
 delete mode 100644 resources/install/debian/patches/guava-update
 create mode 100644 resources/install/debian/patches/removes-gdata-deps

diff --git a/resources/install/build.xml b/resources/install/build.xml
index deb679342..155c7b7d1 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -2373,6 +2373,7 @@
             <fileset dir="${src}">
                 <include name="**/*"/>
                 <exclude name="**/growlnotification/**"/>
+                <exclude name="**/impl/googlecontacts/**"/>
                 <exclude name="**/dict/**"/>
                 <exclude name="**/dictaccregwizz/**"/>
                 <exclude name="**/ssh/**"/>
@@ -2537,14 +2538,14 @@
         <unzip src="${sc.basedir}/../libsrc/jfontchooser-src.zip"
                        dest="${debian.src.dir}/lib/src/jfontchooser"/>
 
-        <!-- gdata -->
+        <!-- gdata
         <unzip src="${sc.basedir}/../libsrc/gdata-src.java-1.43.0.zip"
                dest="${debian.src.dir}/lib/src">
                 <patternset>
                     <exclude name="**/*.orig"/>
                     <exclude name="**/*.jar"/>
                 </patternset>
-        </unzip>
+        </unzip>-->
 
         <!-- jmork -->
         <unzip src="${sc.basedir}/../libsrc/jmork-1.0.5-SNAPSHOT-sources.jar"
@@ -2604,14 +2605,14 @@
                 failonerror="false"/>
         <delete dir="${debian.src.dir}/lib/src/OrangeExtensions/classes"
                 failonerror="false"/>
-        <ant dir="${debian.src.dir}/lib/src/gdata-java-client/java"
+        <!--ant dir="${debian.src.dir}/lib/src/gdata-java-client/java"
             inheritAll="false"
             target="clean"
             antfile="build-src.xml"/>
         <delete dir="${debian.src.dir}/lib/src/gdata-java-client/java/classes"
                 failonerror="false"/>
         <delete dir="${debian.src.dir}/lib/src/gdata-java-client/java/genfiles"
-                failonerror="false"/>
+                failonerror="false"/-->
         <delete dir="${debian.src.dir}/lib/src/jmork/classes"
                 failonerror="false"/>
 
@@ -3031,7 +3032,7 @@ com.ircclouds.irc.api.domain.messages.interfaces&quot;;version=&quot;1.0.0&quot;
                  overwrite="true"
                  link="${debian.src.dir}/lib/installer-exclude"/>
 
-        <!-- gdata -->
+        <!-- gdata
         <ant dir="${debian.src.dir}/lib/src/gdata-java-client/java"
              inheritAll="false"
              target="build"
@@ -3065,7 +3066,7 @@ com.ircclouds.irc.api.domain.messages.interfaces&quot;;version=&quot;1.0.0&quot;
         <symlink
              resource="../src/gdata-java-client/java/lib/gdata-core-1.0.jar"
              overwrite="true"
-             link="${debian.src.dir}/lib/installer-exclude/"/>
+             link="${debian.src.dir}/lib/installer-exclude/"/>-->
         <symlink
              resource="/usr/share/java/guava.jar"
              overwrite="true"
diff --git a/resources/install/debian/README.embedded-libraries b/resources/install/debian/README.embedded-libraries
index 74260376a..60aadd242 100644
--- a/resources/install/debian/README.embedded-libraries
+++ b/resources/install/debian/README.embedded-libraries
@@ -31,12 +31,6 @@ Smack is an Open Source XMPP (Jabber) client library.
 Reason: We contributed several patches on version 3.2.2 in order to fix a memory leak, added code that handles some currently unchecked, fixes for discovery info parsing, a pubsub parsing problem and the option to use a custom javax.net.ssl.TrustManager. All of those have been sent to the smack community for integration about a year ago, but haven’t been integrated since.
 And there’s no Debian package.
 
-- gdata-java-client http://code.google.com/p/gdata-java-client/
-The Google Data Java client library.
-Using version 1.43.0.
-Reason: The package was removed from Debian (package with version 1.30.0
-exist only in squeeze).
-
 - java-jml http://sourceforge.net/apps/trac/java-jml
 JML is a Java API for communication with Windows Live Messenger/
 MSN Messenger services.
diff --git a/resources/install/debian/changelog.tmpl b/resources/install/debian/changelog.tmpl
index 41d258741..67f527e40 100644
--- a/resources/install/debian/changelog.tmpl
+++ b/resources/install/debian/changelog.tmpl
@@ -5,6 +5,7 @@ _PACKAGE_NAME_ (_VERSION_) unstable; urgency=low
   * Fixes BundleException: Unresolved constraint in bundle
     propertieseditor. (Closes: #736773)
   * Fixes commons lang missing felix manifests. (Closes: #736773)
+  * Removes gdata dependency. (Closes: #759835)
 
  -- Damian Minkov <damencho@jitsi.org>  _DATE_
 
diff --git a/resources/install/debian/copyright b/resources/install/debian/copyright
index 8c4b26fbb..8af953e23 100644
--- a/resources/install/debian/copyright
+++ b/resources/install/debian/copyright
@@ -33,11 +33,6 @@ Files: lib/src/jmyspell/*
 Copyright: UNKNOWN:
 License: LGPL-2.1
 
-Files: lib/src/gdata-java-client/*
-Copyright:
- 2006 Google Inc
-License: Apache-2.0
-
 Files: lib/src/java-jml/*
 Copyright:
  2004 Roger Chen
diff --git a/resources/install/debian/patches/guava-update b/resources/install/debian/patches/guava-update
deleted file mode 100644
index 8cb9aac0c..000000000
--- a/resources/install/debian/patches/guava-update
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fixes compilation of gdata
-Index: jitsi-2.3.4901/lib/src/gdata-java-client/java/src/com/google/gdata/wireformats/AltFormat.java
-===================================================================
---- jitsi-2.3.4901.orig/lib/src/gdata-java-client/java/src/com/google/gdata/wireformats/AltFormat.java	2012-09-27 14:40:10.000000000 -0400
-+++ jitsi-2.3.4901/lib/src/gdata-java-client/java/src/com/google/gdata/wireformats/AltFormat.java	2013-11-11 10:42:56.309608000 -0500
-@@ -396,7 +396,7 @@
-       if (types == null) {
-         acceptableTypes = ImmutableSet.of();
-       } else {
--        acceptableTypes = ImmutableSet.of(types);
-+        acceptableTypes = ImmutableSet.copyOf(types);
-       }
-       return this;
-     }
diff --git a/resources/install/debian/patches/removes-gdata-deps b/resources/install/debian/patches/removes-gdata-deps
new file mode 100644
index 000000000..2e1e11e62
--- /dev/null
+++ b/resources/install/debian/patches/removes-gdata-deps
@@ -0,0 +1,25 @@
+Index: jitsi/build.xml
+===================================================================
+--- jitsi.orig/build.xml
++++ jitsi/build.xml
+@@ -1047,7 +1047,7 @@
+         bundle-netaddr,bundle-netaddr-slick,bundle-slickless,
+         bundle-slick-runner,bundle-sip,bundle-sip-slick,bundle-fileaccess,
+         bundle-fileaccess-slick,bundle-neomedia,bundle-ldap,
+-        bundle-googlecontacts-service,bundle-googlecontacts,
++        bundle-googlecontacts-service,
+         bundle-hid-service,bundle-hid,
+         bundle-resource-manager,bundle-resources-defaultpack,
+         bundle-protocol,bundle-protocol-media,bundle-icq,
+Index: jitsi/lib/felix.client.run.properties
+===================================================================
+--- jitsi.orig/lib/felix.client.run.properties
++++ jitsi/lib/felix.client.run.properties
+@@ -98,7 +98,6 @@ felix.auto.start.45= \
+  reference:file:sc-bundles/provdisc-dhcp.jar \
+  reference:file:sc-bundles/provdisc-mdns.jar \
+  reference:file:sc-bundles/googlecontacts-service.jar \
+- reference:file:sc-bundles/googlecontacts.jar \
+  reference:file:sc-bundles/certificate.jar
+ 
+ felix.auto.start.49= \
diff --git a/resources/install/debian/patches/series b/resources/install/debian/patches/series
index 61cb3f4ed..15ab6cf18 100644
--- a/resources/install/debian/patches/series
+++ b/resources/install/debian/patches/series
@@ -1,3 +1,3 @@
 bcprov-upgrade-1.48
-guava-update
 remove-dns-java-logger.patch
+removes-gdata-deps