nonprism/jitsi: updated to 2.10.5550

4 files changed, 60 insertions, 183 deletions

diff --git a/nonprism/jitsi/PKGBUILD b/nonprism/jitsi/PKGBUILD
index 0696c0a8a..e8e082dde 100644
--- a/nonprism/jitsi/PKGBUILD
+++ b/nonprism/jitsi/PKGBUILD
@@ -1,39 +1,36 @@
-# Contributor (Arch): Xavier Devlamynck <magicrhesus@ouranos.be>
-# Contributor (Arch): Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Maintainer (Arch): Xavier Devlamynck <magicrhesus@ouranos.be>
+# Contributors (Arch): Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
+# Contributor: Andreas Grapentin <andreas@grapentin.org>
+# Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 
+# parabola changes and rationale:
+#  - removing support for possibly unsafe protocols
+#  - fix usage of "open source" and "linux" terms
+
 pkgname=jitsi
-pkgver=2.8.5426
-pkgrel=1.nonprism1
+pkgver=2.10.5550
+pkgrel=4.nonprism1
 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator), without support for unsafe and dangerous for privacy protocols"
 arch=('i686' 'x86_64')
 url="http://jitsi.org"
-license=('LGPL')
-replaces=(${pkgname}-nonprism)
-conflicts=(${pkgname}-nonprism)
+license=('Apache')
 depends=('java-runtime')
-makedepends=('apache-ant' 'java-environment')
+makedepends=('apache-ant' 'java-environment-common')
 options=(!strip !emptydirs zipman !libtool docs)
-source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
+source=("https://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
 		jitsi.desktop
 		jitsi.sh
-		drop-open-term-on-index-jn-html.patch
-                nonprism.patch)
-sha256sums=('e649867e186cf195c4b1bb159d7ffe0a38c4dc60659e5c55f9a74461a309f36c'
+		nonprism.patch)
+sha256sums=('cdfc6f038d1b877c42d26dba1864ac7c6b554dd55c18767a29f2db3618647287'
             '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d'
-            '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5'
-            'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631'
-            'bb3a3473fb70b6392ec3c8b400f81c18e1895b9186817401d9fca69e251223aa')
+            'c47bfa98fe36378f2e7b947cd248582f5a90c1b169d53d158badb00439fdc6c7'
+            '437c550c93688efb7f5bec5564093193a663257f9f455fcd5551106db23b2ed3')
 
 prepare() {
   cd $srcdir/$pkgname
 
-  # append the build revision to the jitsi version
-  sed -i "s|0.build.by.SVN|build.$pkgver|" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
-
   # remove Open Source term
-  patch -Np0 -i ../drop-open-term-on-index-jn-html.patch
   sed -i 's|Open Source / ||;
           s|open source / ||;
           s|Open Source|Free Software|;
@@ -73,13 +70,15 @@ prepare() {
 }
 
 build() {
-  cd $srcdir/$pkgname
+  cd "${srcdir}/${pkgname}"
+  # append the build revision to the jitsi version
+  sed -i "s/0\.build\.by\.SVN/build.${pkgver}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
   . /etc/profile.d/apache-ant.sh
   ant rebuild
 }
 
 package() {
-  cd $srcdir/$pkgname
+  cd "${srcdir}/${pkgname}"
   find lib/ lib/bundle/ -maxdepth 1 -type f -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \;
 #  find lib/os-specific/linux/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \;
   shopt -sq extglob
diff --git a/nonprism/jitsi/drop-open-term-on-index-jn-html.patch b/nonprism/jitsi/drop-open-term-on-index-jn-html.patch
deleted file mode 100644
index 8d4012a05..000000000
--- a/nonprism/jitsi/drop-open-term-on-index-jn-html.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- www/index-jn.html	2011-01-29 08:36:48.000000000 -0200
-+++ www/index-jn.html-new	2013-05-29 01:05:48.942716248 -0300
-@@ -1,2 +1,2 @@
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
--<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />                                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />  <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2">   <tbody><tr>     <td valign="middle" style="width: 20%">     <p align="center"> 	<a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br />             SIP Communicator <br />Open Source  VoIP &amp; IM     </p> <br />     </td>     <td style="width: 90%">          <p align="justify">     SIP Communicator is an audio/video Internet phone and instant messenger that     support some of the most popular instant messaging and telephony protocols     such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.     </p>     <p align="justify">     SIP Communicator is completely <a href="http://www.opensource.org/">Open Source</a> /     <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is     freely available under the terms of the     <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>.     </p>      <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white">     <tbody><tr><td style="background-color: lightgray">       <p>         RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a>           can usually answer most questions. You can also ask on the           <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a>             mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a>               #sip-communicator at irc.freenode.net.       </p>       </td></tr>     </tbody></table>     <p><em>         <strong>Note:</strong> Right now SIP Communicator is still a work in         progress and as such is still unstable. If you would like to help or         follow project progress check the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a>           or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>.           You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em>      </p>      <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p>       </td>   </tr> </tbody></table>                                                                     
-+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />                                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />  <table width="100%" cellpadding="0" bordercolor="#111111" border="0" style="border-collapse: collapse" id="AutoNumber2">   <tbody><tr>     <td valign="middle" style="width: 20%">     <p align="center"> 	<a href="http://sip-communicator.org"><img border="0" alt="sip-communicator.org" src="images/sip-communicator.logo.png" /></a><br />             SIP Communicator <br />Free Software  VoIP &amp; IM     </p> <br />     </td>     <td style="width: 90%">          <p align="justify">     SIP Communicator is an audio/video Internet phone and instant messenger that     support some of the most popular instant messaging and telephony protocols     such as SIP, Jabber, AIM/ICQ, MSN and soon others like Yahoo and IRC.     </p>     <p align="justify">     SIP Communicator is completely <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, and is     freely available under the terms of the     <a href="http://www.gnu.org/licenses/lgpl.html">GNU Lesser General Public License</a>.     </p>      <table width="100%" cellspacing="2" cellpadding="2" border="0" style="background-color: white">     <tbody><tr><td style="background-color: lightgray">       <p>         RESOURCES: The SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Documentation/FAQ">FAQ</a>           can usually answer most questions. You can also ask on the           <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists#users">users</a>             mailing list, or at the <a class="urllink" rel="nofollow" href="http://www.sip-communicator.org/irc/irc.cgi">irc channel</a>               #sip-communicator at irc.freenode.net.       </p>       </td></tr>     </tbody></table>     <p><em>         <strong>Note:</strong> Right now SIP Communicator is still a work in         progress and as such is still unstable. If you would like to help or         follow project progress check the <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/Roadmap">Project Roadmap</a>           or join our <a class="wikilink" href="http://www.sip-communicator.org/index.php/Development/MailingLists">Mailing Lists</a>.           You can also have a look at the SIP Communicator <a class="wikilink" href="http://www.sip-communicator.org/index.php/Main/Screenshots">screenshots</a> </em>      </p>      <p> <strong> Thanks for your patience and continuing support! <br /> <a href="https://sip-communicator.org/wiki/index.php/Development/TeamAndContributors"> The SIP Communicator team</a></strong></p>       </td>   </tr> </tbody></table>                                                                     
diff --git a/nonprism/jitsi/jitsi.sh b/nonprism/jitsi/jitsi.sh
index 6e53cdbf5..ae544f39f 100644
--- a/nonprism/jitsi/jitsi.sh
+++ b/nonprism/jitsi/jitsi.sh
@@ -3,15 +3,21 @@
 CLIENTARGS=""
 uname -m | grep i686 && CLIENTARGS="-client -Xmx256m"
 
+if [[ -n ${JAVA_HOME} ]]; then
+  JAVABIN="${JAVA_HOME}/bin/java"
+else
+  JAVABIN="java"
+fi
+
 SCDIR=/usr/lib/jitsi
-LIBPATH="$SCDIR/lib"
-CLASSPATH="$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar"
-FELIX_CONFIG="$LIBPATH/felix.client.run.properties"
-LOG_CONFIG="$LIBPATH/logging.properties"
-COMMAND=("$JAVA_HOME/bin/java" $CLIENTARGS -classpath "$CLASSPATH" -Djna.library.path="$LIBPATH/native" -Dfelix.config.properties="file:$FELIX_CONFIG" -Djava.util.logging.config.file="$LOG_CONFIG" net.java.sip.communicator.launcher.SIPCommunicator)
+LIBPATH="${SCDIR}/lib"
+CLASSPATH="${LIBPATH}/felix.jar:${SCDIR}/sc-bundles/sc-launcher.jar:${SCDIR}/sc-bundles/util.jar:${SCDIR}/sc-bundles/dnsjava.jar:${LIBPATH}"
+FELIX_CONFIG="${LIBPATH}/felix.client.run.properties"
+LOG_CONFIG="${LIBPATH}/logging.properties"
+COMMAND="${JAVABIN} ${CLIENTARGS} -classpath ${CLASSPATH} -Djna.library.path=${LIBPATH}/native -Dfelix.config.properties=file:${FELIX_CONFIG} -Djava.util.logging.config.file=${LOG_CONFIG} net.java.sip.communicator.launcher.SIPCommunicator"
 
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBPATH/native"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${LIBPATH}/native"
 
-cd "$SCDIR"
+cd "${SCDIR}"
 
-exec "${COMMAND[@]}" "$@"
+exec ${COMMAND} $*
diff --git a/nonprism/jitsi/nonprism.patch b/nonprism/jitsi/nonprism.patch
index 09b446ad2..34f0781ae 100644
--- a/nonprism/jitsi/nonprism.patch
+++ b/nonprism/jitsi/nonprism.patch
@@ -1,7 +1,7 @@
 diff -Nur jitsi.orig/build.xml jitsi/build.xml
 --- jitsi.orig/build.xml	2015-02-10 15:12:09.000000000 -0200
 +++ jitsi/build.xml	2015-05-24 11:04:12.075127164 -0300
-@@ -536,7 +536,7 @@
+@@ -503,7 +503,7 @@
          <!--internal-target- setup testing accounts properties -->
          <!-- The following local file should contain a list of protocol
               account initialization properties, such as SIP server addresses
@@ -10,7 +10,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml
               You should create the file based on lib/account.properties.template
               and set all the empty fields as indicated. -->
          <available property="accounts.properties.present"
-@@ -780,9 +780,6 @@
+@@ -732,9 +732,6 @@
                failonerror="true"
                classpathref="project.class.path">
  
@@ -20,7 +20,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml
              <!-- Tell felix to run Jitsi -->
              <sysproperty key="felix.config.properties"
                           value="file:${lib}/felix.client.run.properties"/>
-@@ -887,9 +884,6 @@
+@@ -833,9 +830,6 @@
              failonerror="true"
              classpathref="project.class.path">
  
@@ -30,7 +30,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml
              <!-- Tell felix to run Jitsi -->
              <sysproperty key="felix.config.properties"
                  value="file:${lib}/felix.client.run.properties"/>
-@@ -1047,19 +1041,16 @@
+@@ -922,18 +916,16 @@
          bundle-netaddr,bundle-netaddr-slick,bundle-slickless,
          bundle-slick-runner,bundle-sip,bundle-sip-slick,bundle-fileaccess,
          bundle-fileaccess-slick,bundle-neomedia,bundle-ldap,
@@ -42,36 +42,31 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml
 +        bundle-protocol,bundle-protocol-media,
 +        bundle-mock,bundle-smacklib,bundle-jmdnslib,
          bundle-jabber,bundle-jabber-slick,bundle-swing-ui,bundle-ui-service,
-         bundle-jnalib,bundle-phonenumbers,
-         bundle-irc-api,bundle-irc,bundle-irc-commands,bundle-plugin-ircaccregwizz,
--        bundle-yahoo,bundle-yahoo-slick,
+         bundle-phonenumbers,
+         bundle-irc,bundle-irc-commands,bundle-plugin-ircaccregwizz,
          bundle-contactlist,meta-contactlist,meta-contactlist-slick,
 -        bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz,
 +        bundle-plugin-jabberaccregwizz,
          bundle-plugin-sipaccregwizz,
--        bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz,
-         bundle-commons-codec,bundle-commons-lang,bundle-httputil,bundle-plugin-spellcheck,
+-        bundle-plugin-aimaccregwizz,
+         bundle-httputil,bundle-plugin-spellcheck,
          bundle-version-impl,bundle-shutdown-timeout,bundle-windows-clean-shutdown,
          bundle-growlnotification,bundle-swingnotification,bundle-galagonotification,
-@@ -1074,10 +1065,10 @@
+@@ -949,7 +941,7 @@
          bundle-plugin-keybindingChooser,bundle-plugin-globalproxyconfig,
-         bundle-jfontchooserlib,bundle-update,bundle-plugin-update,
+         bundle-update,bundle-plugin-update,
          bundle-plugin-simpleaccreg,bundle-plugin-generalconfig,
 -        bundle-plugin-googletalkaccregwizz,bundle-argdelegation-service,
 +        bundle-argdelegation-service,
-         bundle-argdelegation,bundle-zrtp4j,bundle-sdes4j,bundle-json,
+         bundle-argdelegation,bundle-json,
          bundle-filehistory,bundle-metahistory,bundle-metahistory-slick,
--        bundle-plugin-facebookaccregwizz,bundle-plugin-ippiaccregwizz,
-+        bundle-plugin-ippiaccregwizz,
-         bundle-bouncycastle,bundle-plugin-otr,bundle-plugin-iptelaccregwizz,
-         bundle-contactsource,bundle-plugin-reconnect,bundle-plugin-securityconfig,
-         bundle-plugin-advancedconfig,
-@@ -1368,31 +1359,6 @@
-         </jar>
+         bundle-plugin-ippiaccregwizz,
+@@ -1294,35 +1268,6 @@
+                  token="&#34;google.api.client.secret&#34;" value="null"/>
      </target>
  
 -    <!--BUNDLE-GOOGLECONTACTS-->
--    <target name="bundle-googlecontacts">
+-    <target name="bundle-googlecontacts" depends="bundle-httputil,bundle-browserlauncher">
 -        <jar compress="false" destfile="${bundles.dest}/googlecontacts.jar"
 -            manifest="${src}/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf">
 -            <zipfileset dir="${dest}/net/java/sip/communicator/service/googlecontacts"
@@ -83,6 +78,10 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml
 -            <zipfileset src="${lib.noinst}/gdata-contacts-meta-3.0.jar" prefix=""/>
 -            <zipfileset src="${lib.noinst}/gdata-client-1.0.jar" prefix=""/>
 -            <zipfileset src="${lib.noinst}/gdata-client-meta-1.0.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/google-oauth-client-1.20.0.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/google-http-client-1.20.0.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/google-http-client-jackson2-1.20.0.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/jackson-core-2.5.3.jar" prefix=""/>
 -        </jar>
 -    </target>
 -
@@ -95,23 +94,19 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml
 -        </jar>
 -    </target>
 -
-     <target name="bundle-guava">
-         <copy file="${lib.noinst}/guava-15.0.jar" tofile="${bundles.dest}/guava.jar"/>
-     </target>
-@@ -1506,12 +1472,7 @@
+     <!--BUNDLE-SERVICEBINDER -->
+     <target name="bundle-servicebinder">
+         <jar compress="true" destfile="lib/bundle/servicebinder.jar"
+@@ -1423,8 +1386,6 @@
              </zipfileset>
              <zipfileset dir="${resources}/images"
                  prefix="resources/images">
 -                <include name="protocol/icq/**/*"/>
 -                <include name="protocol/googletalk/**/*"/>
--                <include name="protocol/facebook/**/*"/>
                  <include name="protocol/jabber/**/*"/>
--                <include name="protocol/msn/**/*"/>
--                <include name="protocol/yahoo/**/*"/>
                  <!-- the media package lives in the protocol-media bundle -->
                  <exclude name="protocol/media/**/*"/>
-             </zipfileset>
-@@ -1570,36 +1531,6 @@
+@@ -1473,36 +1434,6 @@
          </jar>
      </target>
  
@@ -148,69 +143,7 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml
       <!--BUNDLE-MOCK-PROVIDER-->
      <target name="bundle-mock">
          <!--internal-target- Creates a bundle containing the mock implementation of the protocol provider package -->
-@@ -1633,30 +1564,6 @@
-         </jar>
-     </target>
- 
--    <!-- BUNDLE-MSN -->
--    <target name="bundle-msn">
--        <!-- Creates a bundle containing the msn impl of the protocol provider.-->
--        <jar compress="false" destfile="${bundles.dest}/protocol-msn.jar"
--            manifest="${src}/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/msn"
--                prefix="net/java/sip/communicator/impl/protocol/msn"/>
--            <zipfileset src="${lib.noinst}/jml-1.0b5.jar" prefix=""/>
--        </jar>
--    </target>
--
--    <!-- BUNDLE-MSN-SLICK -->
--    <!-- Creates a bundle containing the slick for the Msn protocol provider.-->
--    <target name="bundle-msn-slick">
--        <jar compress="false" destfile="${bundles.dest}/protocol-msn-slick.jar"
--            manifest="${testsrc}/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/msn"
--                prefix="net/java/sip/communicator/slick/protocol/msn"/>
--            <zipfileset src="${lib.noinst}/jml-1.0b5.jar" prefix=""/>
--            <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/generic"
--                prefix="net/java/sip/communicator/slick/protocol/generic"/>
--        </jar>
--    </target>
--
-     <!-- BUNDLE-SSH -->
-     <target name="bundle-ssh">
-         <!-- Creates a bundle containing the SSH impl of the protocol provider.-->
-@@ -1678,30 +1585,6 @@
-         </jar>
-     </target>
- 
--    <!-- BUNDLE-YAHOO -->
--    <target name="bundle-yahoo">
--        <!-- Creates a bundle containing the yahoo impl of the protocol provider.-->
--        <jar compress="false" destfile="${bundles.dest}/protocol-yahoo.jar"
--            manifest="${src}/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/yahoo"
--                prefix="net/java/sip/communicator/impl/protocol/yahoo"/>
--            <zipfileset src="${lib.noinst}/ymsg_network_v0_67.jar" prefix=""/>
--        </jar>
--    </target>
--
--    <!-- BUNDLE-YAHOO-SLICK -->
--    <!-- Creates a bundle containing the slick for the Yahoo protocol provider.-->
--    <target name="bundle-yahoo-slick">
--        <jar compress="false" destfile="${bundles.dest}/protocol-yahoo-slick.jar"
--            manifest="${testsrc}/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/yahoo"
--                prefix="net/java/sip/communicator/slick/protocol/yahoo"/>
--            <zipfileset src="${lib.noinst}/ymsg_network_v0_67.jar" prefix=""/>
--            <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/generic"
--                prefix="net/java/sip/communicator/slick/protocol/generic"/>
--        </jar>
--    </target>
--
-     <!-- BUNDLE-GIBBERISH -->
-     <target name="bundle-gibberish">
-         <!-- Creates a bundle containing the Gibberish impl of the protocol provider.-->
-@@ -1779,26 +1662,6 @@
+@@ -1612,26 +1543,6 @@
          </jar>
      </target>
  
@@ -237,58 +170,3 @@ diff -Nur jitsi.orig/build.xml jitsi/build.xml
      <!-- BUNDLE-PLUGIN-JABBERACCREGWIZZ -->
      <target name="bundle-plugin-jabberaccregwizz">
          <!-- Creates a bundle for the plugin Jabber Account Registration Wizard.-->
-@@ -1809,36 +1672,6 @@
-         </jar>
-     </target>
- 
--    <!-- BUNDLE-PLUGIN-GOOGLETALKACCREGWIZZ -->
--    <target name="bundle-plugin-googletalkaccregwizz">
--        <!-- Creates a bundle for the plugin Google Talk Account Registration Wizard.-->
--        <jar compress="false" destfile="${bundles.dest}/googletalkaccregwizz.jar"
--            manifest="${src}/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/googletalkaccregwizz"
--                prefix="net/java/sip/communicator/plugin/googletalkaccregwizz"/>
--        </jar>
--    </target>
--
--    <!-- BUNDLE-PLUGIN-MSNACCREGWIZZ -->
--    <target name="bundle-plugin-msnaccregwizz">
--        <!-- Creates a bundle for the plugin Msn Account Registration Wizard.-->
--        <jar compress="false" destfile="${bundles.dest}/msnaccregwizz.jar"
--            manifest="${src}/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/msnaccregwizz"
--                prefix="net/java/sip/communicator/plugin/msnaccregwizz"/>
--        </jar>
--    </target>
--
--    <!-- BUNDLE-PLUGIN-YAHOOACCREGWIZZ -->
--    <target name="bundle-plugin-yahooaccregwizz">
--        <!-- Creates a bundle for the plugin Yahoo Account Registration Wizard.-->
--        <jar compress="false" destfile="${bundles.dest}/yahooaccregwizz.jar"
--            manifest="${src}/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/yahooaccregwizz"
--                prefix="net/java/sip/communicator/plugin/yahooaccregwizz"/>
--        </jar>
--    </target>
--
-     <!-- BUNDLE-PLUGIN-SIPACCREGWIZZ -->
-     <target name="bundle-plugin-sipaccregwizz">
-         <!-- Creates a bundle for the plugin SIP Account Registration Wizard.-->
-@@ -1890,17 +1723,6 @@
-         </jar>
-     </target>
- 
--    <!-- BUNDLE-PLUGIN-FACEBOOKACCREGWIZZ -->
--    <target name="bundle-plugin-facebookaccregwizz">
--        <!-- Creates a bundle for the plugin Facebook Account Registration
--             Wizard.-->
--        <jar compress="false" destfile="${bundles.dest}/facebookaccregwizz.jar"
--                manifest="${src}/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf">
--            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/facebookaccregwizz"
--                    prefix="net/java/sip/communicator/plugin/facebookaccregwizz" />
--        </jar>
--    </target>
--
-     <!-- BUNDLE-SERVICEIMPL-VERSION -->
-     <target name="bundle-version-impl">
-         <!-- Creates a bundle for the version service impl.-->