--- psi-plus-0.14~svn952.orig/debian/changelog +++ psi-plus-0.14~svn952/debian/changelog @@ -0,0 +1,502 @@ +psi-plus (0.14~svn952-1) unstable; urgency=low + + * New upstream release + * fix error in description (Closes: Bug#543144) + + -- Ivan Borzenkov Sun, 23 Aug 2009 11:59:56 +0400 + +psi-plus (0.14~svn892-1) unstable; urgency=low + + * New upstream release + * fix error in description (Closes: Bug#540181) + * change build depend libqt4-dev 4.4.0 to 4.5.1 + + -- Ivan Borzenkov Tue, 11 Aug 2009 21:54:45 +0400 + +psi-plus (0.14~svn812-1) unstable; urgency=low + + * New upstream release + * fixed crash in translate plugin + + -- Ivan Borzenkov Thu, 06 Aug 2009 23:09:18 +0400 + +psi-plus (0.14~svn803-1) unstable; urgency=low + + * New upstream release + * update build.sh - switch to 0.14 + * update description + + -- Ivan Borzenkov Wed, 29 Jul 2009 00:49:55 +0400 + +psi-plus (0.13.r802-1) unstable; urgency=low + + * New upstream release + * add conflict with psi and psi-translations (Closes: Bug#538746) + * fix errors on description - thanks to "Artur R. Czechowski" + (Closes: Bug#538749, Bug#538719) + + -- Ivan Borzenkov Tue, 28 Jul 2009 22:44:40 +0400 + +psi-plus (0.13.r735-1) unstable; urgency=low + + * New upstream release + * Add plugins + * update build.sh + * change rules for use cdbs + + -- Ivan Borzenkov Sat, 18 Jul 2009 22:58:36 +0400 + +psi-plus (0.13.r537-1) unstable; urgency=low + + * Use Psi package for build Psi+ package + * Add script for get Psi+ from git and svn + * Add clean iris/lib + * Add conflict to psi + * Create fork - ITP (Closes: Bug#515684) + + -- Ivan Borzenkov Sun, 08 Jun 2009 01:24:54 +0300 + +psi (0.13git090101-1) unstable; urgency=low + + * Update from git + + -- Ivan Borzenkov Thu, 01 Jan 2009 19:15:19 +0300 + +psi (0.12-2) unstable; urgency=low + + * Uploading to unstable (Closes: Bug#494352) + + -- Jan Niehusmann Thu, 28 Aug 2008 18:46:52 +0200 + +psi (0.12-1) experimental; urgency=low + + * Updated to upstream version 0.12 + * Removed some (windows) binaries without sources available from the + orig tarball + * Noticed removal of binaries in debian/copyright + * Fixed some lintian warnings regarding file formatting + * Bumped Standards-Version to 3.8.0 + * Changed dependency on libqt4-dev to >=4.2.3 (instead of >=4.2.3-1) + * Revert CONFIG -= link_prl additions as they are not necessary + since qt 4.4.0~rc1-4 + * Build-Conflict with libqt4-dev 4.4.0~rc1-3 + + -- Jan Niehusmann Wed, 20 Aug 2008 09:25:13 +0200 + +psi (0.11-8) unstable; urgency=low + + * added CONFIG -= link_prl to .pro files and removed dependencies + which are made unnecessary by this change + * Fix segfault when closing last chat tab with qt4.4 + (This is from upstream svn, rev. 1101) (Closes: Bug#476122) + + -- Jan Niehusmann Mon, 14 Apr 2008 18:57:30 +0200 + +psi (0.11-7) unstable; urgency=low + + * With version 4.4.0~rc1-3, libqt4-dev removed some dependencies which + psi needs for building. Added them directly to the psi package. + + -- Jan Niehusmann Sun, 13 Apr 2008 21:43:33 +0200 + +psi (0.11-6) unstable; urgency=low + + * Initialize w2tab before calling addTab in optionstab.cpp + (Closes: Bug#475748) + * added -Wl,--as-needed to LDFLAGS, to minimize dependencies + + -- Jan Niehusmann Sun, 13 Apr 2008 17:24:11 +0200 + +psi (0.11-5) unstable; urgency=low + + * Suggest xdg-utils, since psi can use it to select the default + browser. (Closes: Bug#473837) + * remove /usr/sbin von debian/dirs + * Add README.chinese_fonts with some hints provided by Toni Mueller + (Closes: Bug#280124) + * Update the manual page. It now mentions the online + tutorial on the psi wiki, which should provide sufficient + documentation for new users. (Closes: Bug#307766) + + -- Jan Niehusmann Sun, 06 Apr 2008 22:08:11 +0200 + +psi (0.11-4) unstable; urgency=low + + * Set debian/compat to 5 + * Really set build-dependency on debhelper to >= 5.0.51 (and not + >>5.0.51) + * Update package description. (Closes: Bug#471396) + * Ignore trailing and leading whitespaces in host name + * Apply upstream patch to properly show gpg passphrase dialog. + (Closes: Bug#421194) + * Update Standards-Version to 3.7.3 + + -- Jan Niehusmann Mon, 24 Mar 2008 20:30:24 +0100 + +psi (0.11-3) unstable; urgency=low + + * Added libaspell-dev as build-dependency (Closes: Bug#448434) + * Applied patch submitted by Sikon to use lsb_release to retreive + operating system name (Closes: Bug#451131) + * Added call to dh_icons to debian/rules + * Set build-dependency on debhelper to >= 5.0.51 (for dh_icons) + + -- Jan Niehusmann Thu, 15 Nov 2007 13:17:28 +0100 + +psi (0.11-2) unstable; urgency=low + + * Call configure with option --disable-bundled-qca (Closes: Bug#448363) + * Remove old NEWS.Debian + + -- Jan Niehusmann Wed, 07 Nov 2007 12:02:15 +0100 + +psi (0.11-1) unstable; urgency=low + + * New Upstream Version + * Upload to unstable + + -- Jan Niehusmann Sat, 27 Oct 2007 15:44:16 +0200 + +psi (0.11~rc3-1) experimental; urgency=low + + * New upstream release + * Updated dependencies (Closes: Bug#443120) + + -- Jan Niehusmann Sun, 07 Oct 2007 15:36:20 +0200 + +psi (0.11~rc2-2.1) experimental; urgency=low + + * always build with --enable-debug + + -- Jan Niehusmann Tue, 14 Aug 2007 19:15:40 +0200 + +psi (0.11~rc2-2) experimental; urgency=low + + * Honour DEB_BUILD_OPTIONS=nostrip (Closes: Bug#437834) + * Updated menu file to new menu policy (Section is now + Applications/Network/Communication) + * Applied patch 769:770 from upstream SVN do fix invisible section headings. + + -- Jan Niehusmann Tue, 14 Aug 2007 16:15:15 +0200 + +psi (0.11~rc2-1) experimental; urgency=low + + * New upstream release + * remove dependency on libqt4-debug (Closes: Bug#432620, Bug#412708) + + -- Jan Niehusmann Wed, 25 Jul 2007 00:11:28 +0200 + +psi (0.11~beta2-1) experimental; urgency=low + + * New upstream release + + -- Jan Niehusmann Wed, 9 Aug 2006 18:09:04 +0200 + +psi (0.10-2) unstable; urgency=low + + * Added upstream changelog (Closes: Bug#327748) + * Mention --no-gpg and --no-gpg-agent in manpage (Closes: Bug#204416) + + -- Jan Niehusmann Fri, 20 Jan 2006 00:20:36 +0100 + +psi (0.10-1) experimental; urgency=low + + * New upstream release + * Change default to not play sounds + + -- Jan Niehusmann Sat, 14 Jan 2006 16:33:55 +0100 + +psi (0.9.3+0.10-test2-1) experimental; urgency=low + + * New upstream release + * Cleaned up diff file + + -- Jan Niehusmann Wed, 7 Sep 2005 01:45:19 +0200 + +psi (0.9.3-2) unstable; urgency=low + + * C++ ABI transition + * Apply patch submitted by Andreas Jochens to make psi compile on amd64 + using gcc-4.0 (Closes: Bug#290455) + + -- Jan Niehusmann Fri, 26 Aug 2005 19:51:23 +0200 + +psi (0.9.3-1) unstable; urgency=low + + * New upstream release + * Cleaned up debian/rules (some things are done by upstream Makefiles now) + * Fixed some lintian warnings: + - removed executable bit from some .png files + - moved psi.desktop to /usr/share/applications + * Updated menu files + + -- Jan Niehusmann Mon, 10 Jan 2005 17:41:43 +0100 + +psi (0.9.2+0.9.3-test2-1) experimental; urgency=low + + * New upstream (test-)release + + -- Jan Niehusmann Fri, 31 Dec 2004 15:24:54 +0100 + +psi (0.9.2+0.9.3-test1-1) experimental; urgency=low + + * New upstream (test-)release + * Added Build-Dependency on qca-dev + + -- Jan Niehusmann Mon, 22 Nov 2004 01:35:33 +0100 + +psi (0.9.2-3) experimental; urgency=low + + * Patch by William Waghorn to fix docking behaviour. + (may fix: Bug#207882, Bug#266258) + * Forward ctrl-c key-event to ChatView. (Closes: Bug#260123) + * Updated target 'clean' of debian/rules + + -- Jan Niehusmann Wed, 18 Aug 2004 09:54:40 +0200 + +psi (0.9.2-2) unstable; urgency=low + + * Use menu icon with transparent background, again. (Closes: Bug#261326) + This reverts a change from 0.8.7-2, which is obsolete now. + * Do not listen on a network port if transfer port is set to 0. + Note that this breaks file transfer, if both parties disable the + transfer port. (Closes: Bug#256901) + * Recommend qca-tls (instead of suggesting it). I can't imagine a + good reason not to install qca-tls. (Closes: Bug#263462) + + -- Jan Niehusmann Thu, 12 Aug 2004 09:02:46 +0200 + +psi (0.9.2-1) unstable; urgency=low + + * New upstream release + * Set KDEDIR for ./configure so kde specific files get installed + * Don't install libpsiwidgets.so. It got installed in /usr/share + where it doesn't belong. May be included (at a better location) + later. + + -- Jan Niehusmann Tue, 15 Jun 2004 00:10:41 +0200 + +psi (0.9.1-0.9.2-test1-1) experimental; urgency=low + + * New upstream release + * Quote strings in menu files + + -- Jan Niehusmann Sat, 8 May 2004 22:27:07 +0200 + +psi (0.9.1-3) unstable; urgency=low + + * Make the menu entry start with a captial letter + + -- Jan Niehusmann Tue, 23 Mar 2004 11:13:40 +0100 + +psi (0.9.1-2) unstable; urgency=low + + * Finally uploaded to unstable + * some minor changes to build scripts + + -- Jan Niehusmann Tue, 10 Feb 2004 00:18:09 +0100 + +psi (0.9.1-1) experimental; urgency=low + + * New upstream release + + -- Jan Niehusmann Sun, 18 Jan 2004 23:15:32 +0100 + +psi (0.9-pre-0.9.1-test2-1) experimental; urgency=low + + * New upstream release + + -- Jan Niehusmann Sun, 21 Dec 2003 22:42:30 +0100 + +psi (0.9-pre-0.9.1-test1-1) experimental; urgency=low + + * New upstream release + * Suggest qca-tls (instead of qssl) + * removed gpg 1.2.3 workaround from debian patch, as it was + included upstream + + -- Jan Niehusmann Sun, 28 Sep 2003 22:12:52 +0200 + +psi (0.9-3) unstable; urgency=low + + * Changed Standards-Version to 3.6.1.0 + + -- Jan Niehusmann Wed, 3 Sep 2003 11:52:21 +0200 + +psi (0.9-2) unstable; urgency=low + + * Look for libgnome-2.so.0 instead of libgnome-2.so (Closes: Bug#201892) + * Deal with the changed output of gpg 1.2.3 (Closes: Bug#208082, Bug#208085) + + -- Jan Niehusmann Tue, 19 Aug 2003 19:21:22 +0200 + +psi (0.9-1) unstable; urgency=low + + * New upstream release (Closes: Bug#198041) + - fixes the shutdown bug (Closes: Bug#195520) + - don't open user info window automatically (Closes: Bug#171924) + * revert to psi's native os name detection as it now detects debian + * correct order for chats and sysmessages if chat window is hidden + * Updated README.Debian + * look for libqssl.so.2 (not .1) + + -- Jan Niehusmann Tue, 17 Jun 2003 14:48:44 +0200 + +psi (0.8.7-4) unstable; urgency=low + + * Suggest libqssl1c102 instead of libqssl1 + + -- Jan Niehusmann Tue, 11 Feb 2003 13:38:04 +0100 + +psi (0.8.7-3) unstable; urgency=low + + * compiled with g++-3.2 + * some minor tweaks to make psi compile with qt 3.1.1-2 + + -- Jan Niehusmann Sun, 2 Feb 2003 15:34:35 +0100 + +psi (0.8.7-2) unstable; urgency=low + + * Ctrl-U deletes whole text in message and chat window + * Suggests psi-translations + * Do not reset proxy port to 8080 (Closes: Bug#171610) + * Changed menu icon to only use colors from cmap.xpm + + -- Jan Niehusmann Wed, 4 Dec 2002 18:42:54 +0100 + +psi (0.8.7-1) unstable; urgency=low + + * New upstream release + * Standards-Version: 3.5.7 (do not create or remove doc symlinks). + * Fixed small bug that prevented proper checking of SSL certificates + + -- Jan Niehusmann Thu, 31 Oct 2002 00:31:21 +0100 + +psi (0.8.6-1.2) unstable; urgency=low + + * Remove Build-Depends on libssl-dev + * Depend on qt 3.0.5 and remove workarounds for bugs in older + versions of qt + + -- Jan Niehusmann Wed, 7 Aug 2002 15:57:26 +0200 + +psi (0.8.6-1.1) unstable; urgency=low + + * Fix small bug in workaround for word wrap bug :-) + + -- Jan Niehusmann Wed, 10 Jul 2002 18:56:56 +0200 + +psi (0.8.6-1) unstable; urgency=low + + * New upstream release + * Advertise Debian GNU/Linux as the operating system running the client + * Build uses qmake instead of tmake, so don't depend on tmake. + * Workaround for 'zombie bug' (Still creates one zombie, but doesn't fill up + the process table) (Closes: Bug#143763) + * Temporary workaround for word wrap bug. (Closes: Bug#150856) + * Changed description. Closes: Bug#144239 + * Psi now doesn't use openssl directly. Suggests libqssl. Closes: Bug#142246 + * Do not allow empty profile name in psirc. Closes: Bug#145800 + + -- Jan Niehusmann Mon, 8 Jul 2002 21:50:00 +0200 + +psi (0.8.5-5) unstable; urgency=low + + * Do not escape '&' when calling the web browser + + -- Jan Niehusmann Fri, 19 Apr 2002 02:28:44 +0200 + +psi (0.8.5-4) unstable; urgency=medium + + * Added comment from Justin Karneges to copyright file + * Fixed small config bug + + -- Jan Niehusmann Fri, 19 Apr 2002 02:04:36 +0200 + +psi (0.8.5-3) unstable; urgency=low + + * Fixed silly bug I introduced in -2 (http:// urls didn't work) + + -- Jan Niehusmann Thu, 11 Apr 2002 21:41:09 +0200 + +psi (0.8.5-2) unstable; urgency=low + + * Recognise https:// URLs + + -- Jan Niehusmann Tue, 9 Apr 2002 10:01:29 +0200 + +psi (0.8.5-1) unstable; urgency=low + + * New upstream release + * Remove patch from 0.8.3.1-1 and depend on qt >= 3.0.1, 3.0.0 is obsolete + * Add icon to menu entry + * Add KDE applnk + * Recommends: sox (because psi uses 'play' to play sound effects) + * Not uploaded + + -- Jan Niehusmann Mon, 1 Apr 2002 16:28:24 +0200 + +psi (0.8.4-3) unstable; urgency=low + + * moved from non-US to main + + -- Jan Niehusmann Wed, 27 Mar 2002 10:30:12 +0100 + +psi (0.8.4-2) unstable; urgency=medium + + * load /usr/lib/libssl.so.0.9.6 (from libssl.0.9.6) instead of + /usr/lib/libssl.so (from libssl-dev) for SSL support. Closes: Bug#133897 + + -- Jan Niehusmann Sun, 17 Feb 2002 18:08:42 +0100 + +psi (0.8.4-1) unstable; urgency=low + + * New upstream release + * Removed openssl header files from psi_0.8.4.orig.tar.gz + * Moved to non-US/main because psi now Build-Depends on libssl-dev + + -- Jan Niehusmann Thu, 24 Jan 2002 11:55:21 +0100 + +psi (0.8.3.1-2) unstable; urgency=medium + + * Fixed a bug in SHA::blk0. (only occurs on big endian) + + -- Jan Niehusmann Tue, 15 Jan 2002 11:10:51 +0100 + +psi (0.8.3.1-1) unstable; urgency=low + + * New upstream release + * You will need to reenter your passwords because the encryption changed + * upstream 0.8.3.1 only works with qt3 >=3.0.1. The debian version includes + code from 0.8.2 to work around a bug in qt3 3.0.0. + + -- Jan Niehusmann Sat, 15 Dec 2001 00:48:26 +0100 + +psi (0.8.2-2) unstable; urgency=medium + + * Fix for alpha (and other 64bit architectures). Closes: Bug#123766 + + -- Jan Niehusmann Thu, 13 Dec 2001 02:22:03 +0100 + +psi (0.8.2-1) unstable; urgency=low + + * New upstream release + + -- Jan Niehusmann Wed, 14 Nov 2001 01:36:22 +0100 + +psi (0.8.1-2) unstable; urgency=low + + * Fix segmentation fault when accessing some invalid hosts + * Include README and COPYING in /usr/share/psi, because the binary needs + them + + -- Jan Niehusmann Tue, 6 Nov 2001 17:43:11 +0100 + +psi (0.8.1-1) unstable; urgency=low + + * Initial Release. Closes: Bug#117957 + * Fixed bug that prevented psi from saving its configuration + * Get byteorder from endian.h for SHA1 algorithmn + + -- Jan Niehusmann Thu, 1 Nov 2001 22:20:28 +0100 + --- psi-plus-0.14~svn952.orig/debian/compat +++ psi-plus-0.14~svn952/debian/compat @@ -0,0 +1 @@ +7 --- psi-plus-0.14~svn952.orig/debian/psi-plus.dirs +++ psi-plus-0.14~svn952/debian/psi-plus.dirs @@ -0,0 +1 @@ +usr/bin --- psi-plus-0.14~svn952.orig/debian/copyright +++ psi-plus-0.14~svn952/debian/copyright @@ -0,0 +1,139 @@ +This package was debianized by Ivan Borzenkov on +Mon, 23 Feb 2009 19:56:49 +0300. + +It was get from git://github.com/psi-im/psi.git and +http://psi-dev.googlecode.com/svn/trunk/ +Current versions are available from http://psi-dev.googlecode.com + +Psi+ Project Authors: +Copyright (C) 2008-2009 zet , +Copyright (C) 2008-2009 maj + +Upstream Authors: +Kevin Smith , +Justin Karneges + +Copyright: + +iris module: +Copyright (C) 1999,2000 Tom Tromey +Copyright (C) 2001-2008 Justin Karneges +Copyright (C) 2002,2003 Simon Josefsson +Copyright (C) 2003-2007 Michail Pishchagin +Copyright (C) 2008-2009 Barracuda Networks, Inc. +Copyright (C) 2005 Jeremie Miller +Copyright (C) 2006 Maciek Niedzielski +Copyright (C) 2008 Remko Troncon + + +psi source: +Copyright (C) 2001-2008 Justin Karneges +Copyright (C) 2003-2007 Michail Pishchagin +Copyright (C) 2001-2008 Remko Troncon +Copyright (C) 2006-2008 Martin Hostettler +Copyright (C) 2006-2007 Kevin Smith +Copyright (C) 2006-2008 Joonas Govenius +Copyright (C) 2003 The Internet Society +Copyright (C) 2005 Jeremie Miller +Copyright (C) 2007 Maciek Niedzielski +Copyright (C) 2008 Armando Jagucki + +AutoUpdater: +Copyright (C) 2008 Remko Troncon + +Certificates: +Copyright (C) 2003 Justin Karneges +Copyright (C) 2008 Remko Troncon + +plugins: +Copyright (C) 1992-2000 Trolltech AS. All rights reserved +Copyright (C) 2006 Kevin Smith +Copyright (C) 2005 by SilverSoft.Net +Copyright (C) 2006-2008 Maciej Niedzielski + +tools: +Copyright (C) 2001-2008 Justin Karneges +Copyright (C) 2003-2007 Michail Pishchagin +Copyright (C) 2003-2004 Juan F. Codagnone +Copyright (C) 2003-2007 Eric Smith +Copyright (C) 2005 Remko Troncon +Copyright (C) 2006 Cestonaro Thilo +Copyright (C) 2003 Tarkvara Design Inc. +Copyright (C) 2008 Rion +Copyright (C) 2003 Nullsoft, Inc. +Copyright (C) 1998 Gilles Vollant +Copyright (C) 2005, 2008 James Chaldecott +Copyright (C) 2005, 2008 Maciej Niedzielski + +third-party: +Copyright (C) 1999-2007 The Botan Project. All rights reserved. +Copyright (C) 2004-2007 Brad Hards +Copyright (C) 2003-2008 Justin Karneges +Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved. +Copyright (C) 2003 Robert W. Brewer +Copyright (C) 1999, 2000 Tom Tromey +Copyright 2000 Red Hat, Inc. + +libjingle: +Copyright (C) 2001 Simon MORLAT simon.morlat@linphone.org +Copyright (C) 2005 Remko Troncon + + +patches: +Vladimir Shelukhin, , +Maksim Maj , + +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General Public License +version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +As a special exception, Justin Karneges gives permission to link +this program with the Qt Library (commercial or non-commercial edition), +and distribute the resulting executable, without including the source +code for the Qt library in the source distribution. + +As a special exception, Justin Karneges gives permission to link +this program with the OpenSSL Library. + + +Since version 0.8.6, psi contains 'minizip', a library for unpacking +zip archives. It is distributed with the following copyright: + + Copyright (C) 1998 Gilles Vollant + + Condition of use and distribution are the same than zlib + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + +The Debian packaging is copyright 2009, Ivan Borzenkov and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. --- psi-plus-0.14~svn952.orig/debian/rules +++ psi-plus-0.14~svn952/debian/rules @@ -0,0 +1,50 @@ +#!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/cdbs/1/rules/debhelper.mk + +QMAKE=qmake-qt4 + +# This has to be exported to make some magic below work. +#export DH_OPTIONS + +configure/psi-plus:: + ./configure --prefix=/usr --qtdir=/usr/share/qt4/ --enable-plugins --disable-bundled-qca + +build/psi-plus:: + $(MAKE) + +install/psi-plus:: + $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/psi-plus install + rm -f $(CURDIR)/debian/psi-plus/usr/share/psi/COPYING + rm -f $(CURDIR)/debian/psi-plus/usr/share/psi/README + +clean:: + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.sub config.guess + + rm -f src/Makefile + rm -f Makefile + rm -f libpsi/psiwidgets/Makefile + rm -f src/psi + rm -f conf.pri extra.pri + rm -f conf.log + rm -f src/config.h + rm -f src/.qmake.internal.cache + rm -f psi + + rm -rf iris/lib iris/conf.pri + rm -rf .qconftemp + + cd $(CURDIR)/src/plugins/generic/gmailnotifyplugin && [ ! -f Makefile ] || $(MAKE) distclean + cd $(CURDIR)/src/plugins/generic/juickplugin && [ ! -f Makefile ] || $(MAKE) distclean + cd $(CURDIR)/src/plugins/generic/screenshot && [ ! -f Makefile ] || $(MAKE) distclean + cd $(CURDIR)/src/plugins/generic/translateplugin && [ ! -f Makefile ] || $(MAKE) distclean + +build/psi-plus-plugins:: + cd $(CURDIR)/src/plugins/generic/gmailnotifyplugin && $(QMAKE) && $(MAKE) + cd $(CURDIR)/src/plugins/generic/juickplugin && $(QMAKE) && $(MAKE) + cd $(CURDIR)/src/plugins/generic/screenshot && $(QMAKE) screenshotplugin.pro && $(MAKE) + cd $(CURDIR)/src/plugins/generic/translateplugin && $(QMAKE) && $(MAKE) --- psi-plus-0.14~svn952.orig/debian/README.sources +++ psi-plus-0.14~svn952/debian/README.sources @@ -0,0 +1 @@ +The orig.tar.gz is generated from git and svn repository use psibuild.sh --- psi-plus-0.14~svn952.orig/debian/psi.xpm +++ psi-plus-0.14~svn952/debian/psi.xpm @@ -0,0 +1,47 @@ +/* XPM */ +static char *noname[] = { +/* width height ncolors chars_per_pixel */ +"32 32 8 1", +/* colors */ +" c #000000", +". c #CA8AC9", +"X c #57ACDA", +"o c #ABDBF4", +"O c #72BDE6", +"@ c #87CCF2", +"# c #CDE9F8", +"+ c None", +/* pixels */ +"+ ++++ +++ +", +" ++ + ", +" ###### + #### #####X ", +" #oooooX #ooX #ooooXX ", +" #o@@OX #oOX #o@@OX ", +"+ #o@OX #oOX #o@OX +", +"+++ #o@OX #oOX #o@OX +++", +"+++ #o@OX #oOX #o@OX +++", +"+++ #o@@OX #oOX #o@@OX +++", +"+++ #o@@OX #oOX #o@@OX +++", +"+++ #o@OX #oOX #o@OX +++", +"++++ #o@OX #oOX #o@OX ++++", +"++++ #o@OX #oOX #o@OX ++++", +"++++ #o@OX #oOX #o@OX ++++", +"++++ #o@OX #oOX #o@OX ++++", +"++++ #o@OX #oOX #o@OX ++", +"++++ #o@OX #oOX #o@OX +", +"+++++ #o@OX #oOX #o@OX .. ", +"+++++ Xo@OX #oOX #o@OX .. .. ", +"++++++ Xo@@@@@OOOOOO.. .. .. ", +"+++++++ XXXooo@OOXXX .. .. .. ", +"++++++++ XXoOXX .. .. .. ", +"+++++++++ #oOX .. .. .. ", +"++++++++++++ #oOX + .. .. .. ", +"++++++++++++ #oOX + .. .. ", +"++++++++++++ #oOX ++ .. ", +"++++++++++++ #oOX ++++ +", +"++++++++++++ #oOX ++++++ ++", +"++++++++++++ #oOX ++++++++++++", +"++++++++++++ #XXX ++++++++++++", +"++++++++++++ ++++++++++++", +"+++++++++++++ +++++++++++++" +}; --- psi-plus-0.14~svn952.orig/debian/docs +++ psi-plus-0.14~svn952/debian/docs @@ -0,0 +1,2 @@ +README +TODO --- psi-plus-0.14~svn952.orig/debian/psi-plus.install +++ psi-plus-0.14~svn952/debian/psi-plus.install @@ -0,0 +1,2 @@ +lang/ru/psi_ru.qm /usr/share/psi +debian/psi.xpm /usr/share/psi/ --- psi-plus-0.14~svn952.orig/debian/psibuild.sh +++ psi-plus-0.14~svn952/debian/psibuild.sh @@ -0,0 +1,229 @@ +#!/bin/sh +####################################################################### +# # +# Universal build script of Psi+ under Linux # +# Универсальный скрипт сборки Psi+ под Linux # +# # +####################################################################### + +# REQUIREMENTS / ТРЕБОВАНИЯ + +# In order to build Psi+ you must have next packages in your system +# Для сборки Psi+ вам понадобятся следующие пакеты +# git - vcs system / система контроля версий +# gcc - compiler / компилятор +# qt4 tools libraries and headers (most probably "dev" packages) +# qt4 тулзы либы и хидеры (наверное "dev" пакеты) +# qca/QtCrypto - encryption libs / криптовальные либы + + + +# OPTIONS / НАСТРОЙКИ + +# build and store directory / каталог для сорсов и сборки +#PSI_DIR="${HOME}/psi" +PSI_DIR="/data/soft/pkg/psi/deb" + +# official repository / репа псины +GIT_REPO_PSI=git://github.com/psi-im/psi.git + +# do git pull on psi git working copy on start +# обновляться с репозитория перед сборкой +FORCE_REPO_UPDATE=1 + +# log of applying patches / лог применения патчей +PATCH_LOG=/tmp/psipatch.log + +# do svn up on patches / обновлять патчи со свина +FORCE_PATCH_UPDATE=1 + +# skip patches which applies with errors / пропускать глючные патчи +SKIP_INVALID_PATCH=1 + +# only sources / только архив исходного кода +ONLY_SOURCE=1 + +# configure options / опции скрипта configure +CONF_OPTS="--prefix=/usr --enable-plugins" + +PATCHTESTOPT="--dry-run" +[ `uname` = FreeBSD ] && PATCHTESTOPT="$PATCHTESTOPT -C" + + + +# FUNCTIONS /функкции + +# Exit with error message +die() { echo; echo " !!!ERROR: ${1}"; exit 1; } + +# error status +_epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; } + +#smart patcher +spatch() { + popts="" + PATCH_TARGET="${1}" + + if [ ! -f $PATCH_TARGET ] + then + echo "patch '${PATCH_TARGET}' doesn't exist" + exit 1 + fi + + echo -n " * applying ${PATCH_TARGET}..." + + count=0 + while [ "${count}" -lt 2 ]; do + echo " * trying patch -p${count} ${popts} --dry-run -f" >> $PATCH_LOG + if (cat ${PATCH_TARGET} | patch -p${count} ${popts} ${PATCHTESTOPT} -f ; _epatch_assert) >> $PATCH_LOG 2>&1 + then + cat ${PATCH_TARGET} | patch -p${count} ${popts} >> $PATCH_LOG 2>&1 + _epatch_assert + if [ "$?" -ne 0 ] + then + echo "A dry-run of patch command succeeded, but actually" + echo "applying the patch failed!" + count=5 + fi + break; + fi + count=$((count + 1)) + done + + if [ $count -ne 5 ] + then + echo "done" + return 0 + else + echo "failed" + echo "see log here ${PATCH_LOG}" + return 1 + fi +} + +# Go Go Go! +echo -n "testing environment.." +v=`git --version 2>/dev/null` || die "You should install Git first. / Сначала установите Git" +v=`svn --version 2>/dev/null` || die "You should install subversion first. / Сначала установите subversion" +v=`gmake --version 2>/dev/null` +MAKE="gmake" +if [ -z "$v" ]; then + echo "gmake not found! / gmake не найден!" + echo -n "trying just make / пробуем просто make.." + v=`make --version 2>/dev/null` + MAKE="make" +fi +[ ! -z "$v" ] || die "You should install GNU Make first / Сначала установите GNU Make" +v=`qconf --version |grep qconf` || die "You should install qconf(http://delta.affinix.com/qconf/) / Сначала установите qconf" +echo "OK" + +echo -n "init directories.." +if [ ! -d "${PSI_DIR}" ] +then + mkdir "${PSI_DIR}" || die "can't create work directory ${PSI_DIR}" +fi + +cd "${PSI_DIR}" +if [ ! -d psi ] +then + mkdir psi || die "can't create directory for git sources ${PSI_DIR}/psi" +fi +if [ -d build ] +then + echo -n "removing old build directory.." + rm -rf build || die "can't delete old build directory ${PSI_DIR}/build" +fi +mkdir build || die "can't create build directory ${PSI_DIR}/build" +echo "OK" + +if [ -d "psi/.git" ] +then + echo "Starting updating.." + cd psi + if [ $FORCE_REPO_UPDATE != 0 ]; then + git pull || die "git update failed" + git submodule update || die "git submodule update failed" + else + echo "Update disabled in options" + fi +else + echo "New fresh repo.." + git clone "${GIT_REPO_PSI}" || die "git clone failed" + cd psi + git submodule init || die "git submodule init failed" + git submodule update || die "git submodule update failed" +fi + +echo "exporting sources" +git archive --format=tar master | ( cd "${PSI_DIR}/build" ; tar xf - ) +cd iris +git archive --format=tar master | ( cd "${PSI_DIR}/build/iris" ; tar xf - ) + +echo "downloading psi+.." + +cd "${PSI_DIR}" +if [ -d psi+ ] +then + [ $FORCE_PATCH_UPDATE != 0 ] && ( svn up psi+ || die "psi+ update failed" ) +else + svn co http://psi-dev.googlecode.com/svn/trunk/ psi+/ \ + || die "psi+ checkout failed" +fi + +svn export --force psi+/ build/ + +rm build/patches/*win32* 2>/dev/null +rm build/patches/380* #проверка на апдейт для виндузятников +rm build/patches/600* #поделка "дебианизатора" (руки оторвать) +PATCHES=`ls -1 build/patches/*diff 2>/dev/null` + +# build and install / собираем и устанавливаем +cd "${PSI_DIR}/build" +for p in $PATCHES; do + spatch "${PSI_DIR}/${p}" + if [ "$?" != 0 ] + then + [ $SKIP_INVALID_PATCH != 0 ] && echo "skip invalid patch" + [ $SKIP_INVALID_PATCH == 0 ] && die "can't continue due to patch failed" + fi +done +rev=`svnversion "../psi+"` +sed "s/.xxx/.${rev}/" -i src/applicationinfo.cpp + +sed 's//\1/' -i psi.qc +qconf +if [ $ONLY_SOURCE != 0 ] +then + find "${PSI_DIR}/build" -name '*.orig' | xargs rm -rf $1 + + #очищаем виндовый хлам + find "${PSI_DIR}/build" -name 'win32' | xargs rm -rf $1 + + #Ну кто так файлы кладет в svn + cp -R "${PSI_DIR}/build/plugins" "${PSI_DIR}/build/src/" + rm -rf "${PSI_DIR}/build/plugins" + + #Удаляем копии иконок + rm -rf "${PSI_DIR}/build/iconsets/clients/default" + rm -rf "${PSI_DIR}/build/iconsets/moods/default" + + #к сожалению из-за лицензии + rm -rf "${PSI_DIR}/build/iconsets/clients" + + rm -rf "${PSI_DIR}/psi-plus-0.14~svn${rev}" + mv "${PSI_DIR}/build" "${PSI_DIR}/psi-plus-0.14~svn${rev}" + cd ${PSI_DIR} + tar -cjf "psi-plus-0.14~svn${rev}.tar.bz2" "psi-plus-0.14~svn${rev}" + rm -rf "${PSI_DIR}/psi-plus-0.14~svn${rev}" +else + ./configure "${CONF_OPTS}" || die "configure failed" + $MAKE || die "make failed" + $MAKE install || die "make install failed" + # если получаем ошибку qtcore пишем: qmake-qt4 --version, смотрим путь, + # запускаем ./configure --qtdir=<путь> + # скорее всего это будет: + #./configure --qtdir=/usr/bin +fi + +# удаляем следы сборки пси +#rm psi -r --- psi-plus-0.14~svn952.orig/debian/psi-plus-plugins.dirs +++ psi-plus-0.14~svn952/debian/psi-plus-plugins.dirs @@ -0,0 +1 @@ +usr/lib/psi/plugins --- psi-plus-0.14~svn952.orig/debian/psi-plus.manpages +++ psi-plus-0.14~svn952/debian/psi-plus.manpages @@ -0,0 +1 @@ +debian/psi.1 --- psi-plus-0.14~svn952.orig/debian/control +++ psi-plus-0.14~svn952/debian/control @@ -0,0 +1,100 @@ +Source: psi-plus +Section: net +Priority: optional +Maintainer: Ivan Borzenkov +Build-Depends: debhelper (>= 7), cdbs, libqt4-dev (>= 4.5.1), libqca2-dev (>= 2.0.0), libxss-dev, libaspell-dev, zlib1g-dev, libsm-dev +Standards-Version: 3.8.3 +Homepage: http://psi-dev.googlecode.com/ + +Package: psi-plus +Architecture: any +Recommends: sox, libqca2-plugin-ossl, psi-plus-plugins +Conflicts: libqca2 (<< 2.0.0), psi, psi-translations +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: libqca2-plugin-gnupg, xdg-utils +Provides: psi, psi-translations +Replaces: psi, psi-translations +Description: Jabber client using Qt + Psi+ is a fork of free instant messaging Psi + It has some features that Psi does not have + . + Conference: + - Specifying the reasons for the kick / ban + - Easy to edit and view the topic + - Quick change rank and roles from the context menu in roster / chat + - Insert nick by click + - Context menu for nick in the message window + - User count in the conference roster + - Lock autologin in selected conference (at home / in the various autologin) + - When highlighted - pop up with text message notification + - Collapsing conference roster + - Recognition of hyperlinks in the topic of the conference log + - Constant nick color in conference, is set to hash nickname + - Turn off horizontal scrollbar in conference roster + - Login / autologin in the conference in background + - Voice / video calls, conference participants + - Fast add/remove bookmark + . + Interface: + - Saving photo from the vCard + - Show photo in vCard full size by clicking in resizing window + - Review of services on the button of the vCard + - Avatars contacts in the roster + - Mood icons in the roster + - Tune icons in the roster + - Ability to turn off scroll-bar in the roster + - Display icon in the pop-up notifications + - Text messages in pop-up notifications + - Button to send a message + - View the vCard from the context menu for jid in the body of your message + - Advanced set of commands to adjust the hotkeys + - Align Center icon on the button change the status, as in previous versions + - Display of icons in the status tabs + - The history of writing their own messages on Ctrl + Arrow Up + - Show images of events in a private chat window + - More contrasting color of the selected text + - Switching between tabs on Alt + N + - Close / minimize tab pressing the middle mouse button + - Select nicknames colors in private chat rooms + - "Smart" window size vCard + - Copy text from chat on Ctrl + C + - Copy text from jid field on Ctrl + C + - Option "All in one box" style Tkabber (experimental) + - Turn off buttons on chat toolbar (optional) + - The option to turn off the confirmation of clearing chat window + - Fixed "Subject" position when displaying messages in a chat + - The "Call" in the central bar (voice / video call) + - The "Paste and send" - in the central bar and the menu button "Send" + - Templates of messages - in the central bar and the menu button "Send" + - Show version of the service browser + - Buttons, menus are now working with the click on the icon + - Choice of color lighted messages (highlighted) + - Choice of link color + . + System: + - Support delivery notification (XEP-0184: Message Receipts) + - Time on Issuance iq request (XEP-0090: Entity Time, XEP-0202: Entity Time) + - Support for jabber: iq: version (XEP-0092: Software Version) + - Ability to set the "class" (XEP-0108: User Activity) + - Support for the broadcast stream from the Audacious + - Added command "idle" in the console (jabber: iq: last) + - Making a separate status of a specific contact / conference + - Improved initial setup + - Improved and expanded the definition of operating systems + - Contact Manager + - Locate plugins directory + - The option to exit the application when closure roster + - Revised plugins subsystem + - Show plugin version + - Improved action when moving to jabber-links + - Fixed display of messages in the IRC (Nick say:) + +Package: psi-plus-plugins +Architecture: any +Depends: psi-plus, ${shlibs:Depends}, ${misc:Depends} +Description: Plugins for Psi+ (Gmailnotify, Juick, Screenshot, Translate) + Psi+ Plugins: + - Gmailnotify - check gmail inbox and notification for new mails + - Juick - colorized nicks, tags, quotes from juick@juick.com + - Screenshot - make screenshot and save it to local or ftp + - Translate - convert keyboard on hotkey --- psi-plus-0.14~svn952.orig/debian/psi.1 +++ psi-plus-0.14~svn952/debian/psi.1 @@ -0,0 +1,21 @@ +.TH PSI 1 "November 1, 2001" +.\" Please adjust this date whenever revising the manpage. +.SH NAME +psi \- jabber client +.SH SYNOPSIS +.B psi +.SH DESCRIPTION +.B psi +is a free instant messaging application designed for the Jabber +(XMPP) IM network (including Google Talk). It has full Unicode support, +and supports most important XMPP features like file transfer, group chat, +encryption etc. +.PP +Psi relies on the qca2 library for its encryption features. Therefore, +it's necessary to install libqca2-plugin-ossl for SSL (client-to-server) +encryption and libqca2-plugin-gnupg for PGP (end-to-end) encryption. +.PP +A tutorial can be found on the web at http://psi-im.org/wiki/Tutorial +.SH AUTHOR +This manual page was written by Jan Niehusmann , +for the Debian GNU/Linux system (but may be used by others). --- psi-plus-0.14~svn952.orig/debian/psi-plus-plugins.install +++ psi-plus-0.14~svn952/debian/psi-plus-plugins.install @@ -0,0 +1 @@ +src/plugins/generic/*/*.so usr/lib/psi/plugins --- psi-plus-0.14~svn952.orig/debian/menu +++ psi-plus-0.14~svn952/debian/menu @@ -0,0 +1,3 @@ +?package(psi-plus):needs="X11" section="Applications/Network/Communication"\ + title="Psi+" command="/usr/bin/psi"\ + icon="/usr/share/psi/psi.xpm"