From 0be822175bb3cef0534b9a0597e84ae1ee6374ec Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 01:57:36 -0300 Subject: remove nonprism suffix and add complex pkgrel on nonprism packages --- nonprism/jitsi-nonprism/PKGBUILD | 97 ------- .../drop-open-term-on-index-jn-html.patch | 6 - nonprism/jitsi-nonprism/jitsi.desktop | 10 - nonprism/jitsi-nonprism/jitsi.sh | 17 -- nonprism/jitsi-nonprism/nonprism.patch | 294 --------------------- 5 files changed, 424 deletions(-) delete mode 100644 nonprism/jitsi-nonprism/PKGBUILD delete mode 100644 nonprism/jitsi-nonprism/drop-open-term-on-index-jn-html.patch delete mode 100644 nonprism/jitsi-nonprism/jitsi.desktop delete mode 100644 nonprism/jitsi-nonprism/jitsi.sh delete mode 100644 nonprism/jitsi-nonprism/nonprism.patch (limited to 'nonprism/jitsi-nonprism') diff --git a/nonprism/jitsi-nonprism/PKGBUILD b/nonprism/jitsi-nonprism/PKGBUILD deleted file mode 100644 index d8eaa082d..000000000 --- a/nonprism/jitsi-nonprism/PKGBUILD +++ /dev/null @@ -1,97 +0,0 @@ -# Maintainer (Arch): Xavier Devlamynck -# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne -# Maintainer: André Silva -# Contributor: Márcio Silva - -_pkgname=jitsi -pkgname=jitsi-nonprism -pkgver=2.4.4997 -pkgrel=1 -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) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -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-nonprism/drop-open-term-on-index-jn-html.patch b/nonprism/jitsi-nonprism/drop-open-term-on-index-jn-html.patch deleted file mode 100644 index 8d4012a05..000000000 --- a/nonprism/jitsi-nonprism/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 @@ - --

sip-communicator.org
SIP Communicator
Open Source VoIP & IM


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.

SIP Communicator is completely Open Source / Free Software, and is freely available under the terms of the GNU Lesser General Public License.

RESOURCES: The SIP Communicator FAQ can usually answer most questions. You can also ask on the users mailing list, or at the irc channel #sip-communicator at irc.freenode.net.

Note: 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 Project Roadmap or join our Mailing Lists. You can also have a look at the SIP Communicator screenshots

Thanks for your patience and continuing support!
The SIP Communicator team
-+

sip-communicator.org
SIP Communicator
Free Software VoIP & IM


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.

SIP Communicator is completely Free Software, and is freely available under the terms of the GNU Lesser General Public License.

RESOURCES: The SIP Communicator FAQ can usually answer most questions. You can also ask on the users mailing list, or at the irc channel #sip-communicator at irc.freenode.net.

Note: 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 Project Roadmap or join our Mailing Lists. You can also have a look at the SIP Communicator screenshots

Thanks for your patience and continuing support!
The SIP Communicator team
diff --git a/nonprism/jitsi-nonprism/jitsi.desktop b/nonprism/jitsi-nonprism/jitsi.desktop deleted file mode 100644 index dd4de82a6..000000000 --- a/nonprism/jitsi-nonprism/jitsi.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[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-nonprism/jitsi.sh b/nonprism/jitsi-nonprism/jitsi.sh deleted file mode 100644 index 6e53cdbf5..000000000 --- a/nonprism/jitsi-nonprism/jitsi.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/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/nonprism.patch b/nonprism/jitsi-nonprism/nonprism.patch deleted file mode 100644 index 5effbbd7d..000000000 --- a/nonprism/jitsi-nonprism/nonprism.patch +++ /dev/null @@ -1,294 +0,0 @@ -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 @@ - - - - -- -- -- - - -@@ -871,9 +868,6 @@ - failonerror="true" - classpathref="project.class.path"> - -- -- -- - - -@@ -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 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - - -- -- -- - -- -- - - - -@@ -1519,36 +1480,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1582,30 +1513,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1627,30 +1534,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1728,26 +1611,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1758,36 +1621,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1839,17 +1672,6 @@ - - - -- -- -- -- -- -- -- -- - - - -- cgit v1.2.3-54-g00ecf