diff -NaurEBbwp debian__psi-plus-0.15~svn3410-0ubuntu1/changelog ../debian/changelog --- debian__psi-plus-0.15~svn3410-0ubuntu1/changelog 2010-12-17 14:59:55.000000000 +0200 +++ ../debian/changelog 2010-12-17 23:09:06.000000000 +0200 @@ -1,8 +1,13 @@ -psi-plus (0.15~svn3410-0ubuntu1) natty; urgency=low +psi-plus (0.15~svn3410-1) experimental; urgency=low - * New upstream release + * New upstream release (Closes: #598944) + * Fixed lintian remarks: + I: duplicate-long-description + I: debian-watch-file-is-missing + I: extended-description-is-probably-too-short + I: conflicts-with-version psi-plus (<< 0.15~svn3057) - -- Ivan Borzenkov Fri, 17 Dec 2010 15:59:54 +0300 + -- Boris Pek Fri, 17 Dec 2010 22:03:32 +0200 psi-plus (0.15~svn3396-0ubuntu1) natty; urgency=low diff -NaurEBbwp debian__psi-plus-0.15~svn3410-0ubuntu1/control ../debian/control --- debian__psi-plus-0.15~svn3410-0ubuntu1/control 2010-12-13 22:09:09.000000000 +0200 +++ ../debian/control 2010-12-17 23:09:06.000000000 +0200 @@ -3,8 +3,9 @@ Section: net Priority: optional Maintainer: Ivan Borzenkov Uploaders: Boris Pek -Build-Depends: debhelper (>= 7.0.50~), libqtwebkit-dev | libqt4-dev (>=4.5.2), libqca2-dev (>= 2.0.0), libxss-dev, - libaspell-dev, zlib1g-dev, libsm-dev, quilt, qconf +Build-Depends: debhelper (>= 7.0.50~), + quilt, qconf, libqtwebkit-dev | libqt4-dev (>=4.5.2), + libqca2-dev (>= 2.0.0), libxss-dev, libaspell-dev, zlib1g-dev, libsm-dev Standards-Version: 3.9.1 Homepage: http://psi-dev.googlecode.com/ @@ -13,78 +14,161 @@ Architecture: any Conflicts: psi Depends: psi-plus-common, ${shlibs:Depends}, ${misc:Depends} Replaces: psi -Description: jabber client using Qt - Psi+ is a fork of free instant messaging Psi - It has some features that Psi does not have +Description: Psi+ (basic version) + This package contains basic version of Psi+. + . + Psi is a cross-platform powerful Jabber client (Qt, C++) designed for the + Jabber power users. Psi+ is a development branch of Psi IM Jabber client by + psi-dev@conference.jabber.ru team. + . + Project Purpose: collection, refinement and writing new patches for transfer + them to Psi upstream developers. + . + Full list of features you can found at: + http://psi-plus.com/wiki/doku.php/en:features + +Package: psi-plus-dbg +Section: debug +Priority: extra +Architecture: any +Depends: psi-plus (=${binary:Version}), ${misc:Depends} +Description: Psi+ (basic version) [debug symbols] + This package contains the debugging symbols for basic version of Psi+. + . + Psi is a cross-platform powerful Jabber client (Qt, C++) designed for the + Jabber power users. Psi+ is a development branch of Psi IM Jabber client by + psi-dev@conference.jabber.ru team. + . + Project Purpose: collection, refinement and writing new patches for transfer + them to Psi upstream developers. + . + Full list of features you can found at: + http://psi-plus.com/wiki/doku.php/en:features Package: psi-plus-webkit Architecture: any Conflicts: psi Depends: psi-plus-common, ${shlibs:Depends}, ${misc:Depends} Replaces: psi -Description: jabber client using Qt webkit - Psi+ is a fork of free instant messaging Psi - It has some features that Psi does not have +Description: Psi+ (WebKit version) + This package contains WebKit version of Psi+. + . + Psi is a cross-platform powerful Jabber client (Qt, C++) designed for the + Jabber power users. Psi+ is a development branch of Psi IM Jabber client by + psi-dev@conference.jabber.ru team. . - This package contains webkit version + Project Purpose: collection, refinement and writing new patches for transfer + them to Psi upstream developers. + . + Full list of features you can found at: + http://psi-plus.com/wiki/doku.php/en:features + +Package: psi-plus-webkit-dbg +Section: debug +Priority: extra +Architecture: any +Depends: psi-plus-webkit (=${binary:Version}), ${misc:Depends} +Description: Debug symbols for Psi+ Webkit version + This package contains the debugging symbols for WebKit version of Psi+. + . + Psi is a cross-platform powerful Jabber client (Qt, C++) designed for the + Jabber power users. Psi+ is a development branch of Psi IM Jabber client by + psi-dev@conference.jabber.ru team. + . + Project Purpose: collection, refinement and writing new patches for transfer + them to Psi upstream developers. + . + Full list of features you can found at: + http://psi-plus.com/wiki/doku.php/en:features Package: psi-plus-common Architecture: all Recommends: sox, libqca2-plugin-ossl, psi-plus-plugins, psi-plus-icons, psi-plus-skins -Conflicts: psi-translations, psi-plus (<< 0.15~svn3057) +Conflicts: psi-translations +Breaks: psi-plus (<< 0.15~svn3057) Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: libqca2-plugin-gnupg, xdg-utils Replaces: psi, psi-plus (<< 0.15~svn3057) -Description: common files for psi plus - Common files for psi+ and psi+webkit +Description: common files for Psi+ + This package contains common files for Psi+. + . + Psi is a cross-platform powerful Jabber client (Qt, C++) designed for the + Jabber power users. Psi+ is a development branch of Psi IM Jabber client by + psi-dev@conference.jabber.ru team. + . + Project Purpose: collection, refinement and writing new patches for transfer + them to Psi upstream developers. + . + Full list of features you can found at: + http://psi-plus.com/wiki/doku.php/en:features Package: psi-plus-plugins Architecture: any Depends: psi-plus-common, ${shlibs:Depends}, ${misc:Depends} Description: plugins for Psi+ - Psi+ Plugins + This package contains plugins for Psi+. + . + Psi is a cross-platform powerful Jabber client (Qt, C++) designed for the + Jabber power users. Psi+ is a development branch of Psi IM Jabber client by + psi-dev@conference.jabber.ru team. + . + Project Purpose: collection, refinement and writing new patches for transfer + them to Psi upstream developers. + . + Full list of features you can found at: + http://psi-plus.com/wiki/doku.php/en:features + +Package: psi-plus-plugins-dbg +Section: debug +Priority: extra +Architecture: any +Depends: psi-plus-plugins (=${binary:Version}), ${misc:Depends} +Description: Debug symbols for Psi+ plugins + This package contains the debugging symbols for Psi+ plugins. + . + Psi is a cross-platform powerful Jabber client (Qt, C++) designed for the + Jabber power users. Psi+ is a development branch of Psi IM Jabber client by + psi-dev@conference.jabber.ru team. + . + Project Purpose: collection, refinement and writing new patches for transfer + them to Psi upstream developers. + . + Full list of features you can found at: + http://psi-plus.com/wiki/doku.php/en:features Package: psi-plus-content-download Architecture: any -Conflicts: psi-plus-plugins (<< 0.15~svn3047) +Breaks: psi-plus-plugins (<< 0.15~svn3047) Replaces: psi-plus-plugins (<< 0.15~svn3047) Depends: psi-plus-common, ${shlibs:Depends}, ${misc:Depends} -Description: Content download plugins for Psi+ - Download content frompsi-plus site - all content in packages - this only for fanatics of RMS - normal peoples - install psi-plus-icons and other +Description: content download plugins for Psi+ + This package contains special plugins for Psi+ which allow you download + some content (like non-free icons) from oficial Psi+ site. + . + Psi is a cross-platform powerful Jabber client (Qt, C++) designed for the + Jabber power users. Psi+ is a development branch of Psi IM Jabber client by + psi-dev@conference.jabber.ru team. + . + Project Purpose: collection, refinement and writing new patches for transfer + them to Psi upstream developers. + . + Full list of features you can found at: + http://psi-plus.com/wiki/doku.php/en:features Package: psi-plus-skins Architecture: all Depends: psi-plus-common, psi-plus-plugins, ${shlibs:Depends}, ${misc:Depends} -Conflicts: psi-plus-plugins (<< 0.15~svn3047) +Breaks: psi-plus-plugins (<< 0.15~svn3047) Replaces: psi-plus-plugins (<< 0.15~svn3047) Description: skins for Psi+ - Psi+ skins from psi+ svn and skin plugin - -Package: psi-plus-dbg -Section: debug -Priority: extra -Architecture: any -Depends: psi-plus (=${binary:Version}), ${misc:Depends} -Description: Debug symbols for Psi+ - Psi+ is a fork of free instant messaging Psi - It has some features that Psi does not have - -Package: psi-plus-webkit-dbg -Section: debug -Priority: extra -Architecture: any -Depends: psi-plus-webkit (=${binary:Version}), ${misc:Depends} -Description: Debug symbols for Psi+ Webkit version - Psi+ is a fork of free instant messaging Psi - It has some features that Psi does not have - -Package: psi-plus-plugins-dbg -Section: debug -Priority: extra -Architecture: any -Depends: psi-plus-plugins (=${binary:Version}), ${misc:Depends} -Description: Debug symbols for Psi+ plugins - Psi+ is a fork of free instant messaging Psi - It has some features that Psi does not have + This package contains skins for Psi+. + . + Psi is a cross-platform powerful Jabber client (Qt, C++) designed for the + Jabber power users. Psi+ is a development branch of Psi IM Jabber client by + psi-dev@conference.jabber.ru team. + . + Project Purpose: collection, refinement and writing new patches for transfer + them to Psi upstream developers. + . + Full list of features you can found at: + http://psi-plus.com/wiki/doku.php/en:features diff -NaurEBbwp debian__psi-plus-0.15~svn3410-0ubuntu1/watch ../debian/watch --- debian__psi-plus-0.15~svn3410-0ubuntu1/watch 1970-01-01 03:00:00.000000000 +0300 +++ ../debian/watch 2010-12-17 23:09:06.000000000 +0200 @@ -0,0 +1,2 @@ +version=3 +http://ppa.launchpad.net/psi-plus/ppa/ubuntu/pool/main/p/psi-plus/ .*psi-plus_(.+)\.orig\.tar\.bz2 debian uupdate