forcemerge 538719 538749
tag 538719 patch
tag 538749 patch
found 538719 0.13.r735-1
found 538749 0.13.r735-1
thanks
Здравствуй Иван,
In attached file there is an aggregated patch with fixes to Description
field. However please consider removing some of the stuff from Description.
I suggest to put them in README file in /usr/share/psi-plus.
Regards
Artur
--
- You can take my soul but not my lack of enthusiasm.
/Wally, "Dilbert" 2004.11.23/
diff -Naru debian.orig/README.sources debian/README.sources
--- debian.orig/README.sources 2009-07-28 20:17:35.868581783 +0200
+++ debian/README.sources 2009-07-28 20:17:55.618281675 +0200
@@ -1 +1 @@
-The orig.tar.gz is generated from git and svn ropository use psibuild.sh
+The orig.tar.gz is generated from git and svn repository use psibuild.sh
diff -Naru debian.orig/control debian/control
--- debian.orig/control 2009-07-28 20:17:35.868581783 +0200
+++ debian/control 2009-07-28 20:33:47.570250237 +0200
@@ -15,56 +15,56 @@
Provides: psi, psi-translations
Replaces: psi, psi-translations
Description: Jabber client using Qt
- Psi+ is a mod of free instant messaging Psi
- It has some good fiches diff it of Psi.
+ 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 nik by click
- + Context menu for nik in the message window
- + User count
- + Lock avtologin in selected conference (at home / in the various avtologin)
- + When haylayte - pop up with text message notification
- + Collapsing conference roster
+ - 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
+ - Lock autologin in selected conference (at home / in the various autologin)
+ - When highlighted - pop up with text message notification
+ - Collapsing conference roster
.
Interface:
- + Saving photo from the vCard
- + Show photo in vCard full size by clicking
- + Review of services on the button of the vCard
- + Avatars contacts in the roster
- + Icons in the roster of moods (moods icons)
- + Icons tyunov in the roster (tune)
- + Ability to turn off skroll-bar in the roster
- + Display icon in the pop-up notifications
- + Text messages in pop-up notifications
- + Button 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
- + More contrasting color of the selected text
- + Switching between tabs on Alt + N
- + Close / minimize tab pressing the middle mouse button
+ - Saving photo from the vCard
+ - Show photo in vCard full size by clicking
+ - 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
+ - More contrasting color of the selected text
+ - Switching between tabs on Alt + N
+ - Close / minimize tab pressing the middle mouse button
.
System:
- + Show reports on your messages (XEP-0184: Message Receipts)
- + Send notices of your messages (XEP-0184: Message Receipts)
- + Portable Psi without creating a bat-file (for Windows)
- + Time on Issuance iq request (XEP-0090: Entity Time, XEP-0202: Entity Time)
- + Ability to set the "class" (XEP-0108: User Activity)
- + Support for the broadcast stream from the Audacious (for Linux)
- + Added command "idle" in the console (jabber: iq: last)
- + Finalization for compatibility with Qt 4.5
+ - Show reports on your messages (XEP-0184: Message Receipts)
+ - Send notices of your messages (XEP-0184: Message Receipts)
+ - Portable Psi without creating a bat-file (for Windows)
+ - Time on Issuance iq request (XEP-0090: Entity Time, XEP-0202: Entity Time)
+ - Ability to set the "class" (XEP-0108: User Activity)
+ - Support for the broadcast stream from the Audacious (for Linux)
+ - Added command "idle" in the console (jabber: iq: last)
+ - Finalization for compatibility with Qt 4.5
Package: psi-plus-plugins
Architecture: any
Depends: psi-plus, ${shlibs:Depends}, ${misc:Depends}
Description: Plugins for Psi+
Psi+ Plugins:
- - Gmailnotify Plugin - check gmail inbox and notification for new mails
- - Juick Plugin - colorized nicks, tags, quotes from [email protected]
- - Screenshot Plugin - make screenshot and seve it to local or ftp
- - Translate Plugin - convert keyboard on hotkey
+ - Gmailnotify Plugin - check gmail inbox and notification for new mails
+ - Juick Plugin - colorized nicks, tags, quotes from [email protected]
+ - Screenshot Plugin - make screenshot and save it to local or ftp
+ - Translate Plugin - convert keyboard on hotkey
diff -Naru debian.orig/control.bak debian/control.bak
--- debian.orig/control.bak 1970-01-01 01:00:00.000000000 +0100
+++ debian/control.bak 2009-07-28 20:22:15.437582045 +0200
@@ -0,0 +1,70 @@
+Source: psi-plus
+Section: net
+Priority: optional
+Maintainer: Ivan Borzenkov <[email protected]>
+Build-Depends: debhelper (>= 7), cdbs, libqt4-dev (>= 4.4.0), libqca2-dev (>= 2.0.0), libxss-dev, libaspell-dev, zlib1g-dev, libsm-dev
+Standards-Version: 3.8.2
+Homepage: http://psi-dev.googlecode.com/
+
+Package: psi-plus
+Architecture: any
+Recommends: sox, libqca2-plugin-ossl, psi-plus-plugins
+Conflicts: libqca2 (<< 2.0.0)
+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 mod of free instant messaging Psi
+ It has some good fiches diff it of Psi.
+ .
+ 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
+ - Lock avtologin in selected conference (at home / in the various avtologin)
+ - When haylayte - pop up with text message notification
+ - Collapsing conference roster
+ .
+ Interface:
+ - Saving photo from the vCard
+ - Show photo in vCard full size by clicking
+ - Review of services on the button of the vCard
+ - Avatars contacts in the roster
+ - Icons in the roster of moods (moods icons)
+ - Icons tyunov in the roster (tune)
+ - Ability to turn off scroll-bar in the roster
+ - Display icon in the pop-up notifications
+ - Text messages in pop-up notifications
+ - Button 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
+ - More contrasting color of the selected text
+ - Switching between tabs on Alt + N
+ - Close / minimize tab pressing the middle mouse button
+ .
+ System:
+ - Show reports on your messages (XEP-0184: Message Receipts)
+ - Send notices of your messages (XEP-0184: Message Receipts)
+ - Portable Psi without creating a bat-file (for Windows)
+ - Time on Issuance iq request (XEP-0090: Entity Time, XEP-0202: Entity Time)
+ - Ability to set the "class" (XEP-0108: User Activity)
+ - Support for the broadcast stream from the Audacious (for Linux)
+ - Added command "idle" in the console (jabber: iq: last)
+ - Finalization for compatibility with Qt 4.5
+
+Package: psi-plus-plugins
+Architecture: any
+Depends: psi-plus, ${shlibs:Depends}, ${misc:Depends}
+Description: Plugins for Psi+
+ Psi+ Plugins:
+ - Gmailnotify Plugin - check gmail inbox and notification for new mails
+ - Juick Plugin - colorized nicks, tags, quotes from [email protected]
+ - Screenshot Plugin - make screenshot and seve it to local or ftp
+ - Translate Plugin - convert keyboard on hotkey
