rev 16559 - in kde-extras/kvirc/trunk/debian: . patches source
Mark Purcell
msp at alioth.debian.org
Fri Jan 8 08:46:11 UTC 2010
Author: msp
Date: 2010-01-08 08:46:11 +0000 (Fri, 08 Jan 2010)
New Revision: 16559
Added:
kde-extras/kvirc/trunk/debian/README.source
kde-extras/kvirc/trunk/debian/kvirc-data.preinst
kde-extras/kvirc/trunk/debian/kvirc.docs
kde-extras/kvirc/trunk/debian/kvirc.manpages
kde-extras/kvirc/trunk/debian/patches/10_fix_desktop_entry.patch
kde-extras/kvirc/trunk/debian/patches/20_rm_python_stub.patch
kde-extras/kvirc/trunk/debian/source/
kde-extras/kvirc/trunk/debian/source/format
Removed:
kde-extras/kvirc/trunk/debian/kvirc-dev.install
kde-extras/kvirc/trunk/debian/kvirc-dev.links
kde-extras/kvirc/trunk/debian/kvirc.lintian
kde-extras/kvirc/trunk/debian/patches/kubuntu_01_fix_desktop_entry.patch
kde-extras/kvirc/trunk/debian/source.lintian-overrides
Modified:
kde-extras/kvirc/trunk/debian/
kde-extras/kvirc/trunk/debian/README.Debian
kde-extras/kvirc/trunk/debian/TODO.Debian
kde-extras/kvirc/trunk/debian/changelog
kde-extras/kvirc/trunk/debian/compat
kde-extras/kvirc/trunk/debian/control
kde-extras/kvirc/trunk/debian/copyright
kde-extras/kvirc/trunk/debian/kvirc-data.install
kde-extras/kvirc/trunk/debian/kvirc.install
kde-extras/kvirc/trunk/debian/kvirc.lintian-overrides
kde-extras/kvirc/trunk/debian/patches/series
kde-extras/kvirc/trunk/debian/rules
Log:
The ?\195?\130?\194?\187Creatures of the Night?\195?\130?\194?\171 release.
* Synced to upstream's SVN revision 3763:
- Updated and improved licensing based on GPLv2+
- Including a patch from Debian to remove bashisms. (Closes: #535873)
- Including a German manpage originating from Debian and an Italian manual
page.
- Coming with the rewritten notifier.
- With a new $str.digest implementation, originating from the ?\195?\130?\194?\187no
embedded?\195?\130?\194?\171 branch (see TODO.Debian for further information).
- Performance boost thanks to a rewrite of the treewidget class.
- Fixes an issue with the ?\195?\130?\194?\187popups.kvs?\195?\130?\194?\171 script, addressed in upstream's
SVN revision 3249 <https://svn.kvirc.de/kvirc/changeset/3249>.
(Closes: #539874)
- Fixes an FTBFS with binutils-gold (upstream SVN revision 3596
<https://svn.kvirc.de/kvirc/changeset/3596>). (Closes: #555068)
* debian/control:
- Standards-Version is now 3.8.3:
- Remove obsolete Conflicts and Replaces from kvirc-data's definition.
kvirc-doc isn't even in oldstable (Etch), same applies for versions less
then 2:3.0.0.
- Added libcrypto++-dev and pkg-config to Build-Depends, to enable new
$str.digest code.
- Ensure Qt 4.5.0 or higher is present (not the case on S390).
- Added ${misc:Depends} to kvirc-data entry.
- Improved package descriptions (thanks to Raphael Geissert).
- Added a Conflicts: for kvirc-dev, so the old package gets removed.
- Removed CDBS from Build-Depends.
- Added versioned Build-Depends for debhelper and pkg-kde-tools, which
allows us to switch to dh only.
- Removed quilt, isn't needed according to
<http://wiki.debian.org/Projects/DebSrc3.0>.
* debian/TODO.Debian:
- Removed item about adding a German manpage, as this was addressed by
r3268 <https://svn.kvirc.de/kvirc/changeset/3268> in upstream's VCS (by
myself).
- Removed item about installing protocol handlers.
- Removed item about not cleaned out filelist.txt files, wasn't a CDBS bug,
but one in the CMakeLists.txt file, see
<https://svn.kvirc.de/kvirc/changeset/3265> for further information.
- Removed item about kvirc-config4, we don't ship that anymore.
- Added an SVN URL to the item about removing embedded code where the
progress can be tracked.
- Added reminder about Python module.
* debian/kvirc-data.preinst:
- Added (thanks to Raphael Geissert for pointing the not needed
parentheses out to me).
- Handle some cruft left over from 3.4 releases. (Closes: #534291)
* debian/kvirc-data.install: Install protocol handlers again, now directly
into <file:///usr/share/services>.
* Don't build kvirc-dev anylonger. Unused so far and would need a great
deal of work to be Policy compliant again.
* debian/kvirc.lintian-overrides: Added ?\195?\130?\194?\187kvirc: no-symbols-control-file
usr/lib/libkvilib.so.4.0.0?\195?\130?\194?\171 as the library is only used in KVIrc modules
and we don't ship kvirc-dev anymore.
* debian/rules:
- Manually set the SVN revision number.
- Reduce dependencies, one audio backend is enough.
- Added ?\195?\130?\194?\187-DWITH_NO_EMBEDDED_CODE=YES?\195?\130?\194?\171 to CMake invocation.
- Rewrote the rules for dh7 only (without CDBS).
- Removed quilt from dh invocation, now handled by dpkg-source (source
format ?\195?\130?\194?\1873.0 (quilt)?\195?\130?\194?\171).
* debian/source.lintian-overrides: Removed (Thanks to Raphael Geissert).
* debian/copyright:
- Added BSD license for some CMake snippets we don't use but are shipped by
upstream (we use the ones provided by kdelibs5-dev or don't build the
relevant part). (Thanks to Barry deFreese and Raphael Geissert.)
* debian/compat: bumped to 7.
* debian/kvirc.docs: Added.
* debian/kvirc.manpages: Added.
* debian/kvirc.install: Removed man pages.
* debian/source/format: Added with ?\195?\130?\194?\1873.0 (quilt)?\195?\130?\194?\171 as its content.
* Added debian/patches/20_rm_python_stub.patch which removes the always build
Python module stub, because we don't build the Python module.
* Adding a debug package so debug information can be provided.
* Do not provide upstream TODO.
* Adding packaging copyright to Kai Wasserb?\195?\131?\194?\164ch.
* Provide a more consistent name to kubuntu_01_fix_desktop_entry.patch
patch to 10_fix_desktop_entry.patch. Suggested by Eugene V. Lyubimkin
* Updated copyright file.
* Using english as default manpage.
* Addind README.source documenting how to build package from latest sources.
* Add get-orig-source to pull exact version from upstream svn
* Add myself to uploaders
See README.Debian for a short note on this.
Property changes on: kde-extras/kvirc/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: kde-extras/kvirc/trunk/debian/README.Debian
===================================================================
--- kde-extras/kvirc/trunk/debian/README.Debian 2010-01-08 08:15:37 UTC (rev 16558)
+++ kde-extras/kvirc/trunk/debian/README.Debian 2010-01-08 08:46:11 UTC (rev 16559)
@@ -3,7 +3,7 @@
A word on upgrading from KVIrc 3.x to KVIrc 4.x
***********************************************
- The deault configuration directory of KVIrc 3.x is <file://$HOME/.kvirc>.
+ The default configuration directory of KVIrc 3.x is <file://$HOME/.kvirc>.
It might happen on the first startup of KVIrc 4, that you're asked where to
store your configuration. In this case you can safely select the old
configurtion directory to use your old settings. Any warnings, that this is
Added: kde-extras/kvirc/trunk/debian/README.source
===================================================================
--- kde-extras/kvirc/trunk/debian/README.source (rev 0)
+++ kde-extras/kvirc/trunk/debian/README.source 2010-01-08 08:46:11 UTC (rev 16559)
@@ -0,0 +1,6 @@
+If you want to build latest development versions, both kvirc upstream and debian
+packaging, follow this instructions:
+1- svn export https://svn.kvirc.de/svn/trunk/kvirc kvirc-4.0~svn$(svn info https://svn.kvirc.de/svn/trunk/kvirc |grep Rev -m 1 -i Rev |cut -d" " -f2)
+2- cd kvirc-4.0~svn$(svn info https://svn.kvirc.de/svn/trunk/kvirc |grep Rev -m 1 -i Rev |cut -d" " -f2)
+2- wget http://hg.debian.org/hg/pkg-kde/kde-extras/kvirc/archive/tip.tar.gz -O -|tar xvz --strip 1
+3- dpkg-buildpackage
Modified: kde-extras/kvirc/trunk/debian/TODO.Debian
===================================================================
--- kde-extras/kvirc/trunk/debian/TODO.Debian 2010-01-08 08:15:37 UTC (rev 16558)
+++ kde-extras/kvirc/trunk/debian/TODO.Debian 2010-01-08 08:46:11 UTC (rev 16559)
@@ -6,19 +6,13 @@
it's possible to use a -dev package and rather use a central copy in the
Debian Archive.
Example: src/modules/my/idle* from Psi.
+ Progress can be tracked at
+ <https://svn.kvirc.de/svn/branches/kvirc/curan/no_embedded_lib_code>
* Split some of the modules out of the main package, to allow a minimal
installation. Maybe create an »kvirc-extras« package, which contains those
modules and some more themes or something like that.
-* Make the kvirc-dev package working/meaningful again. It doesn't include
- any .h files, and it's probably arch:all
-* Write a German manpage (assigned to Kai Wasserbäch).
-* Clean doesn't totally clean. filelist.txt files are still present, CDBS bug
- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=521711
-* Added irc and ircs protocol system handlers.
* Study the possibility and add, if convenient, Build-Depends-Indep
* Look into dpkg-shlibdeps warnings for plugins (*.so) called from kvirc binary.
-* Upstream: kvirc4-config even with coexistence disabled.
* Check this point for policy 3.8.1 update:
- The maintainer name and email address used in the changelog should be the
details of the person uploading this version.
-
Modified: kde-extras/kvirc/trunk/debian/changelog
===================================================================
--- kde-extras/kvirc/trunk/debian/changelog 2010-01-08 08:15:37 UTC (rev 16558)
+++ kde-extras/kvirc/trunk/debian/changelog 2010-01-08 08:46:11 UTC (rev 16559)
@@ -1,3 +1,98 @@
+kvirc (4:4.0.0~svn3763-1) unstable; urgency=low
+
+ The »Creatures of the Night« release.
+
+ * Synced to upstream's SVN revision 3763:
+ - Updated and improved licensing based on GPLv2+
+ - Including a patch from Debian to remove bashisms. (Closes: #535873)
+ - Including a German manpage originating from Debian and an Italian manual
+ page.
+ - Coming with the rewritten notifier.
+ - With a new $str.digest implementation, originating from the »no
+ embedded« branch (see TODO.Debian for further information).
+ - Performance boost thanks to a rewrite of the treewidget class.
+ - Fixes an issue with the »popups.kvs« script, addressed in upstream's
+ SVN revision 3249 <https://svn.kvirc.de/kvirc/changeset/3249>.
+ (Closes: #539874)
+ - Fixes an FTBFS with binutils-gold (upstream SVN revision 3596
+ <https://svn.kvirc.de/kvirc/changeset/3596>). (Closes: #555068)
+
+ [ Kai Wasserbäch ]
+ * debian/control:
+ - Standards-Version is now 3.8.3:
+ - Remove obsolete Conflicts and Replaces from kvirc-data's definition.
+ kvirc-doc isn't even in oldstable (Etch), same applies for versions less
+ then 2:3.0.0.
+ - Added libcrypto++-dev and pkg-config to Build-Depends, to enable new
+ $str.digest code.
+ - Ensure Qt 4.5.0 or higher is present (not the case on S390).
+ - Added ${misc:Depends} to kvirc-data entry.
+ - Improved package descriptions (thanks to Raphael Geissert).
+ - Added a Conflicts: for kvirc-dev, so the old package gets removed.
+ - Removed CDBS from Build-Depends.
+ - Added versioned Build-Depends for debhelper and pkg-kde-tools, which
+ allows us to switch to dh only.
+ - Removed quilt, isn't needed according to
+ <http://wiki.debian.org/Projects/DebSrc3.0>.
+ * debian/TODO.Debian:
+ - Removed item about adding a German manpage, as this was addressed by
+ r3268 <https://svn.kvirc.de/kvirc/changeset/3268> in upstream's VCS (by
+ myself).
+ - Removed item about installing protocol handlers.
+ - Removed item about not cleaned out filelist.txt files, wasn't a CDBS bug,
+ but one in the CMakeLists.txt file, see
+ <https://svn.kvirc.de/kvirc/changeset/3265> for further information.
+ - Removed item about kvirc-config4, we don't ship that anymore.
+ - Added an SVN URL to the item about removing embedded code where the
+ progress can be tracked.
+ - Added reminder about Python module.
+ * debian/kvirc-data.preinst:
+ - Added (thanks to Raphael Geissert for pointing the not needed
+ parentheses out to me).
+ - Handle some cruft left over from 3.4 releases. (Closes: #534291)
+ * debian/kvirc-data.install: Install protocol handlers again, now directly
+ into <file:///usr/share/services>.
+ * Don't build kvirc-dev anylonger. Unused so far and would need a great
+ deal of work to be Policy compliant again.
+ * debian/kvirc.lintian-overrides: Added »kvirc: no-symbols-control-file
+ usr/lib/libkvilib.so.4.0.0« as the library is only used in KVIrc modules
+ and we don't ship kvirc-dev anymore.
+ * debian/rules:
+ - Manually set the SVN revision number.
+ - Reduce dependencies, one audio backend is enough.
+ - Added »-DWITH_NO_EMBEDDED_CODE=YES« to CMake invocation.
+ - Rewrote the rules for dh7 only (without CDBS).
+ - Removed quilt from dh invocation, now handled by dpkg-source (source
+ format »3.0 (quilt)«).
+ * debian/source.lintian-overrides: Removed (Thanks to Raphael Geissert).
+ * debian/copyright:
+ - Added BSD license for some CMake snippets we don't use but are shipped by
+ upstream (we use the ones provided by kdelibs5-dev or don't build the
+ relevant part). (Thanks to Barry deFreese and Raphael Geissert.)
+ * debian/compat: bumped to 7.
+ * debian/kvirc.docs: Added.
+ * debian/kvirc.manpages: Added.
+ * debian/kvirc.install: Removed man pages.
+ * debian/source/format: Added with »3.0 (quilt)« as its content.
+ * Added debian/patches/20_rm_python_stub.patch which removes the always build
+ Python module stub, because we don't build the Python module.
+
+ [ Raúl Sánchez Siles ]
+ * Adding a debug package so debug information can be provided.
+ * Do not provide upstream TODO.
+ * Adding packaging copyright to Kai Wasserbäch.
+ * Provide a more consistent name to kubuntu_01_fix_desktop_entry.patch
+ patch to 10_fix_desktop_entry.patch. Suggested by Eugene V. Lyubimkin
+ * Updated copyright file.
+ * Using english as default manpage.
+ * Addind README.source documenting how to build package from latest sources.
+
+ [ Mark Purcell ]
+ * Add get-orig-source to pull exact version from upstream svn
+ * Add myself to uploaders
+
+ -- Mark Purcell <msp at debian.org> Fri, 08 Jan 2010 19:44:35 +1100
+
kvirc (4:4.0.0~svn3240-1) unstable; urgency=low
The »Dream Team« release.
@@ -40,7 +135,7 @@
- Fixes »kvirc: embedding perl needs PERL_SYS_INIT3()« for real (upstream
changeset <https://svn.kvirc.de/kvirc/changeset/3023>). (Was bug:
#495064)
- See README.Debian for a quick note on this.
+ See README.Debian for a short note on this.
- Includes OFTC/irc.debian.org in the standard server list.
- Refreshed patches.
* debian/control:
@@ -50,8 +145,6 @@
- Changed Vcs-* fields to point to the hg repository, which is where the
package development takes place today.
- Added ${misc:Depends} to kvirc.
- * debian/rules: Added »-DWITHOUT_PYTHON=YES«, module wasn't built anyway so
- far, so we can safe the buildds the tests.
* debian/TODO.Debian: Added.
* debian/source.lintian-overrides: Added.
- »kvirc source: debhelper-but-no-misc-depends« added for
Modified: kde-extras/kvirc/trunk/debian/compat
===================================================================
--- kde-extras/kvirc/trunk/debian/compat 2010-01-08 08:15:37 UTC (rev 16558)
+++ kde-extras/kvirc/trunk/debian/compat 2010-01-08 08:46:11 UTC (rev 16559)
@@ -1 +1 @@
-6
+7
Modified: kde-extras/kvirc/trunk/debian/control
===================================================================
--- kde-extras/kvirc/trunk/debian/control 2010-01-08 08:15:37 UTC (rev 16558)
+++ kde-extras/kvirc/trunk/debian/control 2010-01-08 08:46:11 UTC (rev 16559)
@@ -1,13 +1,14 @@
Source: kvirc
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.0),
- kdelibs5-dev, libesd0-dev, libperl-dev, pkg-kde-tools, zlib1g-dev, libx11-dev,
- libxrender-dev, libssl-dev
+Build-Depends: debhelper (>= 7.3.16), cmake, kdelibs5-dev, libperl-dev,
+ pkg-kde-tools (>= 0.5), zlib1g-dev, libx11-dev, libxrender-dev, libssl-dev,
+ libqt4-dev (>= 4.5.0), libcrypto++-dev, pkg-config
Section: net
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Raúl Sánchez Siles <rasasi78 at gmail.com>,
- Kai Wasserbäch <debian at carbon-project.org>
-Standards-Version: 3.8.1
+ Kai Wasserbäch <debian at carbon-project.org>,
+ Mark Purcell <msp at debian.org>
+Standards-Version: 3.8.3
Vcs-Hg: http://hg.debian.org/hg/pkg-kde/kde-extras/kvirc/
Vcs-Browser: http://hg.debian.org/hg/pkg-kde/kde-extras/kvirc/
Homepage: http://www.kvirc.de/
@@ -16,39 +17,41 @@
Architecture: any
Depends: kvirc-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: kvirc-data (<< ${source:Version})
-Description: KDE based next generation IRC client with module support
+Conflicts: kvirc-dev
+Suggests: kvirc-dbg (= ${source:Version})
+Description: KDE-based next generation IRC client with module support
A highly configurable graphical IRC client with an MDI interface,
built-in scripting language, support for IRC DCC, drag & drop file
browsing, and much more. KVIrc uses the KDE widget set, can be extended
using its own scripting language, integrates with KDE, and supports
custom plugins.
.
- If you are a developer and you want to write a custom module for KVIrc,
- you need to install the kvirc-dev package.
+ If you're looking for a simple and plain IRC client, KVIrc is probably the
+ wrong choice as it is rather big. But if you want a highly customizable client
+ you won't regret the installation.
Package: kvirc-data
Architecture: all
+Depends: ${misc:Depends}
Suggests: kvirc (>= ${source:Version})
-Conflicts: kvirc-doc, kvirc (<< 2:3.0.0)
-Replaces: kvirc-doc
Description: Data files for KVIrc
This package contains the architecture-independent data needed by KVIrc in
order to run, such as icons and images, language files, and shell scripts.
It also contains complete reference guides on scripting and functions
- within KVIrc in its internal help format. Unless you want to use KVIrc only
- as a very simple IRC client you are likely to want to write scripts to
- tailor KVIrc to your needs.
- .
- KVIrc is a graphical IRC client based on the KDE widget set which integrates
- with the K Desktop Environment.
+ within KVIrc in its internal help format.
-Package: kvirc-dev
-Section: devel
+Package: kvirc-dbg
Architecture: any
-Depends: kvirc (>= ${source:Version})
-Description: Development files for KVIrc
- This package contains KVIrc libraries and include files you need if you
- want to develop plugins for KVIrc.
+Section: debug
+Priority: extra
+Depends: kvirc (= ${binary:Version}), ${misc:Depends}
+Description: KVIrc (IRC client) debugging symbols
+ A highly configurable graphical IRC client with an MDI interface,
+ built-in scripting language, support for IRC DCC, drag & drop file
+ browsing, and much more. KVIrc uses the KDE widget set, can be extended
+ using its own scripting language, integrates with KDE, and supports
+ custom plugins.
.
- KVIrc is a graphical IRC client based on the KDE widget set which integrates
- with the K Desktop Environment.
+ This package is intended to help debugging possible problems with KVIrc.
+
+
Modified: kde-extras/kvirc/trunk/debian/copyright
===================================================================
--- kde-extras/kvirc/trunk/debian/copyright 2010-01-08 08:15:37 UTC (rev 16558)
+++ kde-extras/kvirc/trunk/debian/copyright 2010-01-08 08:46:11 UTC (rev 16559)
@@ -2,9 +2,10 @@
Wed, 8 Sep 2004 18:49:44 +0100 and reworked by Raúl Sánchez Siles
<rasasi78 at gmail.com> on Thu, 17 Apr 2008 09:49:21 +0200
-The Debian packaging is Copyright 2008, Raul Sánchez Siles <rasasi78 at gmail.com>
-and is licensed under the GPLv2, which can be found at
-'/usr/share/common-licenses/GPL-2' on Debian GNU/Linux systems
+The Debian packaging is Copyright 2009, Raul Sánchez Siles <rasasi78 at gmail.com>
+Kai Wasserbäch <debian at carbon-project.org> and is licensed under the GPLv2,
+which can be found at '/usr/share/common-licenses/GPL-2' on Debian GNU/Linux
+systems.
It was updated to 4.0.0 pre-release (svn 20090126) by Roderick B. Greening <roderick.greening at gmail.com>
on Mon, 26 Jan 2009 12:15:00 -330
@@ -14,55 +15,60 @@
Upstream Author: Szymon Stefanek <kvirc at tin.it>
License:
+This is the KVIrc Irc Client license.
-This is the KVIrc Irc Client license. It is based on the GNU General Public License.
-It contains all the GPL terms and conditions and adds a special exception
-(see Terms and Conditions , clause 13 and 14) to its distribution limitations.
+It is based on the GNU General Public License either version 2, or
+(at your option) any later version. The full text of versions 2 and 3 of
+the GPL can be found respectively in the files LICENSE-GPLV2 and LICENSE-GPLV3.
+KVIrc License contains all the GPL terms and conditions and adds a special
+exception (see "OpenSSL Exception" below) to the distribution limitations.
-Note that the GPL below is copyrighted by the Free Software
-Foundation, but the instance of code that it refers to is copyrighted by
+Note that the GPL is copyrighted by the Free Software Foundation,
+but the instance of code that it refers to is copyrighted by
Szymon Stefanek and other members of the KVIrc Development Team.
-The source code for all versions of KVIrc is freely
-available at http://www.kvirc.net
+The source code for all versions of KVIrc is available at http://www.kvirc.net
Have fun!
Szymon Stefanek :)
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991.
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License version 2 and version 3 can be found in
+`/usr/share/common-licenses/GPL-2' and `/usr/share/common-licenses/GPL-3',
+respectively.
- This package 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 General Public License for more details.
+ _OpenSSL Exception_
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301, USA.
+0. Definitions
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+"KVIrc" means KVIrc software licensed under version 2 or any later
+version of the GNU General Public License (collectively, "GPL"), or a
+work based on such software and licensed under the GPL.
-clause 13 and 14)
+"OpenSSL" means OpenSSL toolkit software distributed by the OpenSSL
+Project and licensed under the OpenSSL Licenses, or a work based on such
+software and licensed under the OpenSSL Licenses.
- 13. As a special exception, Szymon Stefanek gives permission to link this
-program with Qt non-commercial edition for Windows, and distribute the resulting executable,
-without including the source code for the Qt non-commercial edition in the source
-distribution. The Qt non-commercial edition library is covered by the
-Qt Non-Commercial license. See http://www.trolltech.com for informations.
+"OpenSSL Licenses" means the OpenSSL License and Original SSLeay License
+under which the OpenSSL Project distributes the OpenSSL toolkit software,
+as those licenses appear in the file LICENSE-OPENSSL.
- 14. As a special exception, Szymon Stefanek gives permission to link this
-program with the OpenSSL project's "OpenSSL" library (or with modified
-versions of it that use the same license as the "OpenSSL" library), and
-distribute the linked executables. You must obey the GNU General Public
-License in all respects for all of the code used other than "OpenSSL".
-If you modify file(s), you may extend this exception to your version
-of the file(s), but you are not obligated to do so. If you do not wish to do
-so, delete this exception statement from your version.
+1. Exception
+You have permission to copy, modify, propagate, and distribute a work
+formed by combining OpenSSL with KVIrc, or a work derivative of such a
+combination, even if such copying, modification, propagation, or
+distribution would otherwise violate the terms of the GPL. You must
+comply with the GPL in all respects for all of the code used other than
+OpenSSL.
+
+You may include this OpenSSL Exception and its grant of permissions when
+you distribute KVIrc. Inclusion of this notice with such a
+distribution constitutes a grant of such permission. If you do not wish
+to grant these permissions, remove this section entitled "OpenSSL
+Exception" from your distribution.
+
+
Copyright
KVIrc:
@@ -122,32 +128,11 @@
License can be found in `/usr/share/common-licenses/LGPL'.
--
-modules/FindSubversion.cmake:
+cmake/modules/FindLibV4L2.cmake Copyright © 2009 Jaroslav Reznik <jreznik at redhat.com>
+cmake/modules/FindPhonon.cmake Copyright © 2008 Matthias Kretz <kretz at kde.org>
+cmake/modules/FindTheora.cmake Copyright © 2006-2007 Laurent Montel <montel at kde.org>
- Copyright (c) 2006, Tristan Carel All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer. * Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions and the
- following disclaimer in the documentation and/or other materials provided with
- the distribution. * Neither the name of the University of California, Berkeley
- nor the names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-On Debian systems, the complete text of the BSD-like License version BY-LC-NE
-can be found in /usr/share/common-licenses/BSD-BY-LC-NE
-
+ These files are licensed under the 3-clause BSD license.
+ The License can be found in `/usr/share/common-licenses/BSD' on Debian
+ systems.
+--
Modified: kde-extras/kvirc/trunk/debian/kvirc-data.install
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc-data.install 2010-01-08 08:15:37 UTC (rev 16558)
+++ kde-extras/kvirc/trunk/debian/kvirc-data.install 2010-01-08 08:46:11 UTC (rev 16559)
@@ -10,3 +10,4 @@
debian/tmp/usr/share/kvirc/*/pics/
debian/tmp/usr/share/kvirc/*/themes/
debian/tmp/usr/share/mime/packages/kvirc.xml
+data/protocols/*.protocol usr/share/services
Added: kde-extras/kvirc/trunk/debian/kvirc-data.preinst
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc-data.preinst (rev 0)
+++ kde-extras/kvirc/trunk/debian/kvirc-data.preinst 2010-01-08 08:46:11 UTC (rev 16559)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+# Remove some cruft, we don't need anymore. As we didn't remove it with the
+# first 4.x release, we use le "4:4.0.0~svn3240-1" for comparison.
+case "$1" in
+ install|upgrade)
+ if dpkg --compare-versions "$2" le "4:4.0.0~svn3240-1"; then
+ if update-alternatives --quiet --query irc.protocol >/dev/null 2>&1
+ then
+ update-alternatives --quiet --remove irc.protocol \
+ /usr/share/kvirc/3.4.0/services/irc.protocol
+ fi
+
+ if update-alternatives --quiet --query irc6.protocol >/dev/null 2>&1
+ then
+ update-alternatives --quiet --remove irc6.protocol \
+ /usr/share/kvirc/3.4.0/services/irc6.protocol
+ fi
+ fi
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: kde-extras/kvirc/trunk/debian/kvirc.docs
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc.docs (rev 0)
+++ kde-extras/kvirc/trunk/debian/kvirc.docs 2010-01-08 08:46:11 UTC (rev 16559)
@@ -0,0 +1,2 @@
+TODO
+README
Modified: kde-extras/kvirc/trunk/debian/kvirc.install
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc.install 2010-01-08 08:15:37 UTC (rev 16558)
+++ kde-extras/kvirc/trunk/debian/kvirc.install 2010-01-08 08:46:11 UTC (rev 16559)
@@ -2,5 +2,3 @@
debian/tmp/usr/lib/*.so.*
debian/tmp/usr/lib/kvirc/*/modules/*.so
debian/tmp/usr/share/applications/kvirc.desktop
-debian/tmp/usr/share/man/man1/kvirc.1
-
Modified: kde-extras/kvirc/trunk/debian/kvirc.lintian-overrides
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc.lintian-overrides 2010-01-08 08:15:37 UTC (rev 16558)
+++ kde-extras/kvirc/trunk/debian/kvirc.lintian-overrides 2010-01-08 08:46:11 UTC (rev 16559)
@@ -2,3 +2,4 @@
kvirc: menu-icon-missing /usr/share/pixmaps/kvirc32x32.xpm
#Library just used for kvirc.
kvirc: package-name-doesnt-match-sonames libkvilib4
+kvirc: no-symbols-control-file usr/lib/libkvilib.so.4.0.0
Added: kde-extras/kvirc/trunk/debian/kvirc.manpages
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc.manpages (rev 0)
+++ kde-extras/kvirc/trunk/debian/kvirc.manpages 2010-01-08 08:46:11 UTC (rev 16559)
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man1/kvirc.1
+data/man/kvirc.de.1
+data/man/kvirc.it.1
Added: kde-extras/kvirc/trunk/debian/patches/10_fix_desktop_entry.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/10_fix_desktop_entry.patch (rev 0)
+++ kde-extras/kvirc/trunk/debian/patches/10_fix_desktop_entry.patch 2010-01-08 08:46:11 UTC (rev 16559)
@@ -0,0 +1,15 @@
+Corrected the place to show up for the desktop entry.
+---
+ cmake/kvirc4.desktop.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/cmake/kvirc4.desktop.cmake
+===================================================================
+--- a/cmake/kvirc4.desktop.cmake
++++ b/cmake/kvirc4.desktop.cmake
+@@ -8,4 +8,4 @@ Exec=${KVIRC_BINARYNAME} -m %u
+ Icon=kvirc
+ Type=Application
+ MimeType=application/x-kva;application/x-kvt;
+-Categories=Qt;Network;IRCClient;
++Categories=Qt;KDE;Network;IRCClient;
Added: kde-extras/kvirc/trunk/debian/patches/20_rm_python_stub.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/20_rm_python_stub.patch (rev 0)
+++ kde-extras/kvirc/trunk/debian/patches/20_rm_python_stub.patch 2010-01-08 08:46:11 UTC (rev 16559)
@@ -0,0 +1,101 @@
+The Debian package is build without Python support but KVIrc adds a stub for
+Python scriping even if Python support is disabled at build time.
+This patch removes that stub.
+---
+ src/kvirc/kvs/kvi_kvs_parser.h | 3 ---
+ src/kvirc/kvs/kvi_kvs_parser_command.cpp | 12 +++---------
+ src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp | 3 ---
+ src/modules/pythoncore/CMakeLists.txt | 2 ++
+ 4 files changed, 5 insertions(+), 15 deletions(-)
+
+Index: b/src/kvirc/kvs/kvi_kvs_parser_command.cpp
+===================================================================
+--- a/src/kvirc/kvs/kvi_kvs_parser_command.cpp
++++ b/src/kvirc/kvs/kvi_kvs_parser_command.cpp
+@@ -130,7 +130,8 @@ KviKvsTreeNodeCommand * KviKvsParser::pa
+ // We're lookin' for interpreters like perl and python
+ // perl.begin and python.begin have a *really* half special
+ // parsing routine
+- if((iIdentifierLen == 4) || (iIdentifierLen == 6))
++ // DEB: Removed Python stub as we build without that module.
++ if(iIdentifierLen == 4)
+ {
+ if(pIdentifier->toLower().unicode() == 'p')
+ {
+@@ -139,12 +140,9 @@ KviKvsTreeNodeCommand * KviKvsParser::pa
+ if(KviQString::equalCI(szIdentifier,"perl"))
+ {
+ szInterpreter = "perl";
+- } else if(KviQString::equalCI(szIdentifier,"python"))
+- {
+- szInterpreter = "python";
+ }
+
+- if((szInterpreter == "perl") || (szInterpreter == "python"))
++ if((szInterpreter == "perl"))
+ {
+ if(pSecondPart)
+ {
+@@ -155,10 +153,6 @@ KviKvsTreeNodeCommand * KviKvsParser::pa
+ {
+ // yep, that's perl.begin
+ cmd = parseSpecialCommandPerlBegin();
+- } else if(szInterpreter == "python")
+- {
+- // yep, that's python.begin
+- cmd = parseSpecialCommandPythonBegin();
+ }
+
+ if(!cmd)
+Index: b/src/kvirc/kvs/kvi_kvs_parser.h
+===================================================================
+--- a/src/kvirc/kvs/kvi_kvs_parser.h
++++ b/src/kvirc/kvs/kvi_kvs_parser.h
+@@ -224,9 +224,6 @@ private:
+ // stops after the perl.end statement
+ KviKvsTreeNodeCommand * parseSpecialCommandPerlBegin();
+ // returns 0 only in case of error
+- // stops after the perl.end statement
+- KviKvsTreeNodeCommand * parseSpecialCommandPythonBegin();
+- // returns 0 only in case of error
+ // and stops after the end of the help command
+ KviKvsTreeNodeCommand * parseSpecialCommandHelp();
+
+Index: b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
+===================================================================
+--- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
++++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
+@@ -38,10 +38,8 @@ Once parsed, the command is routed to th
+ with the interpreter code as FIRST parameter and the other parameters
+ of the command following.
+ the help page for perl.begin is in the perl module
+-the help page for python.begin is in the python module
+
+ perl.begin(context) <perl code> perl.end
+-python.begin <python code> python.end
+ */
+ #define IMPLEMENT_EXTERNAL_INTERPRETER_BEGIN(__name) \
+ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommand##__name##Begin() \
+@@ -125,7 +123,6 @@ python.begin <python code> python.end
+ }
+
+ IMPLEMENT_EXTERNAL_INTERPRETER_BEGIN(Perl)
+-IMPLEMENT_EXTERNAL_INTERPRETER_BEGIN(Python)
+
+ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandBreak()
+ {
+Index: b/src/modules/pythoncore/CMakeLists.txt
+===================================================================
+--- a/src/modules/pythoncore/CMakeLists.txt
++++ b/src/modules/pythoncore/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ # CMakeLists for src/modules/pythoncore
++IF(COMPILE_PYTHON_SUPPORT)
+
+ #SET(kvipythoncore_MOC_HDRS
+ # pythoncoreinterface.h
+@@ -18,3 +19,4 @@ SET(KVI_DEFAULT_FRAME_CAPTION "")
+ SET(kvi_module_name kvipythoncore)
+
+ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
++ENDIF(COMPILE_PYTHON_SUPPORT)
Modified: kde-extras/kvirc/trunk/debian/patches/series
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/series 2010-01-08 08:15:37 UTC (rev 16558)
+++ kde-extras/kvirc/trunk/debian/patches/series 2010-01-08 08:46:11 UTC (rev 16559)
@@ -1,2 +1,3 @@
05_xpmicon.patch
-kubuntu_01_fix_desktop_entry.patch
+10_fix_desktop_entry.patch
+20_rm_python_stub.patch
Modified: kde-extras/kvirc/trunk/debian/rules
===================================================================
--- kde-extras/kvirc/trunk/debian/rules 2010-01-08 08:15:37 UTC (rev 16558)
+++ kde-extras/kvirc/trunk/debian/rules 2010-01-08 08:46:11 UTC (rev 16559)
@@ -1,12 +1,38 @@
#! /usr/bin/make -f
#
-DEB_DH_ALWAYS_EXCLUDE:=CVS:.svn:.svnignore:.hg:.hgignore
-DEB_DH_INSTALL_ARGS:=-XCOPYING
-DEB_KDE_LINK_WITH_AS_NEEDED:=yes
+DH_ALWAYS_EXCLUDE:=CVS:.svn:.svnignore:.hg:.hgignore
-include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+DEBVERSION = $(shell head -n 1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION = $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//')
+REV = $(shell echo $(UPVERSION) | sed -e 's/^.*svn//')
-DEB_CMAKE_EXTRA_FLAGS += -DWANT_COEXISTENCE=OFF -DWITHOUT_PYTHON=YES
-# -DWITH_ix86_ASM COMPILE_MMX_ASM -DCOEXISTENCE
+override_dh_auto_configure:
+ dh_auto_configure -Skde -- -DWANT_COEXISTANCE=OFF -DWITHOUT_PYTHON=YES \
+ -DMANUAL_REVISION=3763 -DWITHOUT_ESD=YES -DWITHOUT_OSS=YES \
+ -DWITH_NO_EMBEDDED_CODE=YES -DWITHOUT_STRIP=ON \
+ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
+
+override_dh_install:
+ dh_install -XCOPYING
+
+override_dh_strip:
+ dh_strip --dbg-package=kvirc-dbg
+
+%:
+ dh --with kde $@
+
+
+get-orig-source:
+ @@dh_testdir
+ @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+ @@echo 'Checking out for repacking (might take 15 min) ... REV: ' $(REV)
+ @@svn export https://svn.kvirc.de/svn/trunk/kvirc@$(REV) ../tarballs/kvirc-$(REV).tmp
+ @@echo 'Getting the changelog (might take 15 min) ...'
+ @@cd ../tarballs/kvirc-$(REV).tmp; svn2cl -o changelog https://svn.kvirc.de/svn/trunk/kvirc@$(REV)
+ @@echo Creating the tarball ...
+ @@cd ../tarballs/kvirc-$(REV).tmp; tar zcf ../kvirc_$(UPVERSION).orig.tar.gz *
+ @@rm -rf ../tarballs/kvirc-$(REV).tmp
+ @@echo Ready for packaging.
+
Added: kde-extras/kvirc/trunk/debian/source/format
===================================================================
--- kde-extras/kvirc/trunk/debian/source/format (rev 0)
+++ kde-extras/kvirc/trunk/debian/source/format 2010-01-08 08:46:11 UTC (rev 16559)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-kde-commits
mailing list