remove nonprism suffix and add complex pkgrel on nonprism packages

5 files changed, 422 insertions, 0 deletions

diff --git a/nonprism/jitsi/PKGBUILD b/nonprism/jitsi/PKGBUILD
new file mode 100644
index 000000000..d3bc07db2
--- /dev/null
+++ b/nonprism/jitsi/PKGBUILD
@@ -0,0 +1,95 @@
+# Maintainer (Arch): Xavier Devlamynck <magicrhesus@ouranos.be>
+# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
+
+pkgname=jitsi
+pkgver=2.4.4997
+pkgrel=1.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' 'mips64el')
+url="http://jitsi.org"
+license=('LGPL')
+replaces=(${pkgname}-nonprism)
+conflicts=(${pkgname}-nonprism)
+depends=('jre7-openjdk')
+makedepends=('apache-ant' 'jdk7-openjdk')
+options=(!strip !emptydirs zipman !libtool docs)
+source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
+		jitsi.desktop
+		jitsi.sh
+		drop-open-term-on-index-jn-html.patch
+                nonprism.patch)
+sha256sums=('f1c2688d7d6bf1916fed3b8b105a785662980c5b297dcab3c9e7d272647ef825'
+            '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d'
+            '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5'
+            'a862465431e9d272e00bb9aafe56edec0d5c4f3718062add53972685adb90631'
+            'b66440b35108713e2ada0d8d892c870f72363a238c6c9fa9dba24e02256d5017')
+
+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|;
+          s|open source|free software|;
+         ' $(grep -ril 'open source')
+  sed -i 's|OpenSource / ||;
+          s|opensource / ||;
+          s|OpenSource|FreeSoftware|;
+          s|opensource|freesoftware|;
+         ' $(grep -ril opensource)
+
+  # remove Linux term
+  sed -i '/, Linux/ s|Linux|GNU/Linux|;
+          /And Linux/ s|Linux|GNU/Linux|;
+          /and Linux/ s|Linux|GNU/Linux|;
+          /For Linux/ s|Linux|GNU/Linux|;
+          /for Linux/ s|Linux|GNU/Linux|;
+          /Linux,/ s|Linux|GNU/Linux|;
+          /Linux and/ s|Linux|GNU/Linux|;
+          /Linux distribution/ s|Linux|GNU/Linux|;
+          /Linux machine/ s|Linux|GNU/Linux|;
+          /Linux operating/ s|Linux|GNU/Linux|;
+          /Linux OS/ s|Linux|GNU/Linux|;
+          /Linux specific/ s|Linux|GNU/Linux|;
+          /Linux system/ s|Linux|GNU/Linux|;
+          /Under Linux/ s|Linux|GNU/Linux|;
+          /under Linux/ s|Linux|GNU/Linux|;
+          /On Linux/ s|Linux|GNU/Linux|;
+          /on Linux/ s|Linux|GNU/Linux|;
+          s|GNU/GNU|GNU|;
+          s|GNU/Linux kernel|Linux kernel|;
+          s|GNU/Linux specific kernel|Linux specific kernel|;
+         ' $(grep -rl Linux)
+
+  # remove support for unsafe and dangerous for privacy protocols (AIM, Facebook, Google Talk, ICQ, MSN and Yahoo!)
+  patch -Np1 -i $srcdir/nonprism.patch
+}
+
+build() {
+  cd $srcdir/$pkgname
+  . /etc/profile.d/apache-ant.sh
+  ant rebuild
+}
+
+package() {
+  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
+  find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \;
+  find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \;
+  install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+  cd "resources/install/debian/"
+  for _file in *.{svg,xpm}; do
+    install -Dm644 "$_file" "${pkgdir}/usr/share/pixmaps/${_file}"
+  done
+}
diff --git a/nonprism/jitsi/drop-open-term-on-index-jn-html.patch b/nonprism/jitsi/drop-open-term-on-index-jn-html.patch
new file mode 100644
index 000000000..8d4012a05
--- /dev/null
+++ b/nonprism/jitsi/drop-open-term-on-index-jn-html.patch
@@ -0,0 +1,6 @@
+--- 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.desktop b/nonprism/jitsi/jitsi.desktop
new file mode 100644
index 000000000..dd4de82a6
--- /dev/null
+++ b/nonprism/jitsi/jitsi.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Jitsi
+GenericName=jitsi
+Comment=VoIP and Instant Messaging client
+Icon=/usr/share/pixmaps/jitsi.svg
+Type=Application
+Categories=Network
+Exec=/usr/bin/jitsi
+Terminal=false
diff --git a/nonprism/jitsi/jitsi.sh b/nonprism/jitsi/jitsi.sh
new file mode 100644
index 000000000..6e53cdbf5
--- /dev/null
+++ b/nonprism/jitsi/jitsi.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+CLIENTARGS=""
+uname -m | grep i686 && CLIENTARGS="-client -Xmx256m"
+
+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)
+
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBPATH/native"
+
+cd "$SCDIR"
+
+exec "${COMMAND[@]}" "$@"
diff --git a/nonprism/jitsi/nonprism.patch b/nonprism/jitsi/nonprism.patch
new file mode 100644
index 000000000..5effbbd7d
--- /dev/null
+++ b/nonprism/jitsi/nonprism.patch
@@ -0,0 +1,294 @@
+diff -Nur jitsi.orig/build.xml jitsi/build.xml
+--- jitsi.orig/build.xml	2013-12-08 18:17:08.000000000 -0200
++++ jitsi/build.xml	2014-04-20 01:08:28.365493685 -0300
+@@ -536,7 +536,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
+-             and usernames, ICQ uin-s and passwords, AIM screennames and etc.
++             and usernames, etc.
+              You should create the file based on lib/account.properties.template
+              and set all the empty fields as indicated. -->
+         <available property="accounts.properties.present"
+@@ -774,9 +774,6 @@
+               failonerror="true"
+               classpathref="project.class.path">
+ 
+-            <!-- Sets the charset for the messages -->
+-            <!--sysproperty key="icq.custom.message.charset" value="windows-1252"/-->
+-
+             <!-- Tell felix to run Jitsi -->
+             <sysproperty key="felix.config.properties"
+                          value="file:${lib}/felix.client.run.properties"/>
+@@ -871,9 +868,6 @@
+             failonerror="true"
+             classpathref="project.class.path">
+ 
+-            <!-- Sets the charset for the messages -->
+-            <!--sysproperty key="icq.custom.message.charset" value="windows-1252"/-->
+-
+             <!-- Tell felix to run Jitsi -->
+             <sysproperty key="felix.config.properties"
+                 value="file:${lib}/felix.client.run.properties"/>
+@@ -1032,18 +1026,15 @@
+         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-hid-service,bundle-hid,
+         bundle-resource-manager,bundle-resources-defaultpack,
+-        bundle-protocol,bundle-protocol-media,bundle-icq,
+-        bundle-icq-slick,bundle-mock,bundle-smacklib,bundle-jmdnslib,
++        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-msn,bundle-msn-slick,bundle-yahoo,bundle-yahoo-slick,
+         bundle-contactlist,meta-contactlist,meta-contactlist-slick,
+-        bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz,
+-        bundle-plugin-msnaccregwizz,bundle-plugin-sipaccregwizz,
+-        bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz,
++        bundle-plugin-jabberaccregwizz,
++        bundle-plugin-sipaccregwizz,
+         bundle-commons-codec,bundle-commons-lang,bundle-httputil,bundle-plugin-spellcheck,
+         bundle-version-impl,bundle-shutdown-timeout,bundle-windows-clean-shutdown,
+         bundle-growlnotification,bundle-swingnotification,bundle-galagonotification,
+@@ -1058,10 +1049,10 @@
+         bundle-plugin-keybindingChooser,bundle-plugin-globalproxyconfig,
+         bundle-jfontchooserlib,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-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,
+@@ -1339,31 +1330,6 @@
+         </jar>
+     </target>
+ 
+-    <!--BUNDLE-GOOGLECONTACTS-->
+-    <target name="bundle-googlecontacts">
+-        <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"
+-                prefix="net/java/sip/communicator/service/googlecontacts"/>
+-            <zipfileset dir="${dest}/net/java/sip/communicator/impl/googlecontacts"
+-                prefix="net/java/sip/communicator/impl/googlecontacts" />
+-            <zipfileset src="${lib.noinst}/google-collect-1.0-rc1.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/gdata-core-1.0.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/gdata-contacts-3.0.jar" prefix=""/>
+-            <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=""/>
+-        </jar>
+-    </target>
+-    <!--BUNDLE-GOOGLECONTACTS-SERVICE-->
+-    <target name="bundle-googlecontacts-service">
+-        <jar compress="false" destfile="${bundles.dest}/googlecontacts-service.jar"
+-            manifest="${src}/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf">
+-            <zipfileset dir="${dest}/net/java/sip/communicator/service/googlecontacts"
+-                prefix="net/java/sip/communicator/service/googlecontacts"/>
+-        </jar>
+-    </target>
+-
+     <!--BUNDLE-SERVICEBINDER -->
+     <target name="bundle-servicebinder">
+         <jar compress="true" destfile="lib/bundle/servicebinder.jar"
+@@ -1466,12 +1432,7 @@
+                 prefix="net/java/sip/communicator/service/protocol"/>
+             <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>
+@@ -1519,36 +1480,6 @@
+         </jar>
+     </target>
+ 
+-    <!-- BUNDLE-ICQ -->
+-    <target name="bundle-icq">
+-        <!-- Creates a bundle containing the icq impl of the protocol provider.-->
+-        <jar compress="false" destfile="${bundles.dest}/protocol-icq.jar"
+-            manifest="${src}/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf">
+-            <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/icq"
+-                prefix="net/java/sip/communicator/impl/protocol/icq"/>
+-            <zipfileset src="${lib.noinst}/joscar-client.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/joscar-common.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/joscar-protocol.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/jsocks-klea.jar" prefix=""/>
+-        </jar>
+-    </target>
+-
+-    <!-- BUNDLE-ICQ-SLICK -->
+-    <target name="bundle-icq-slick">
+-        <!-- Creates a bundle containing the slick for the ICQ protocol provider.-->
+-        <jar compress="false" destfile="${bundles.dest}/protocol-icq-slick.jar"
+-            manifest="${testsrc}/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf">
+-            <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/icq"
+-                prefix="net/java/sip/communicator/slick/protocol/icq"/>
+-            <zipfileset dir="${dest}/net/java/sip/communicator/slick/protocol/generic"
+-                prefix="net/java/sip/communicator/slick/protocol/generic"/>
+-            <zipfileset src="${lib.noinst}/joscar-client.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/joscar-common.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/joscar-protocol.jar" prefix=""/>
+-            <zipfileset src="${lib.noinst}/jsocks-klea.jar" prefix=""/>
+-        </jar>
+-    </target>
+-
+      <!--BUNDLE-MOCK-PROVIDER-->
+     <target name="bundle-mock">
+         <!--internal-target- Creates a bundle containing the mock implementation of the protocol provider package -->
+@@ -1582,30 +1513,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.-->
+@@ -1627,30 +1534,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.-->
+@@ -1728,26 +1611,6 @@
+         </jar>
+     </target>
+ 
+-    <!-- BUNDLE-PLUGIN-ICQACCREGWIZZ -->
+-    <target name="bundle-plugin-icqaccregwizz">
+-        <!-- Creates a bundle for the plugin Icq Account Registration Wizard.-->
+-        <jar compress="false" destfile="${bundles.dest}/icqaccregwizz.jar"
+-            manifest="${src}/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf">
+-            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/icqaccregwizz"
+-                prefix="net/java/sip/communicator/plugin/icqaccregwizz"/>
+-        </jar>
+-    </target>
+-
+-    <!-- BUNDLE-PLUGIN-AIMACCREGWIZZ -->
+-    <target name="bundle-plugin-aimaccregwizz">
+-        <!-- Creates a bundle for the plugin Aim Account Registration Wizard.-->
+-        <jar compress="false" destfile="${bundles.dest}/aimaccregwizz.jar"
+-            manifest="${src}/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf">
+-            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/aimaccregwizz"
+-                prefix="net/java/sip/communicator/plugin/aimaccregwizz"/>
+-        </jar>
+-    </target>
+-
+     <!-- BUNDLE-PLUGIN-JABBERACCREGWIZZ -->
+     <target name="bundle-plugin-jabberaccregwizz">
+         <!-- Creates a bundle for the plugin Jabber Account Registration Wizard.-->
+@@ -1758,36 +1621,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.-->
+@@ -1839,17 +1672,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.-->