rev 16555 - in kde-extras/kvirc/trunk/debian: . patches
Mark Purcell
msp at alioth.debian.org
Fri Jan 8 08:01:46 UTC 2010
Author: msp
Date: 2010-01-08 08:01:43 +0000 (Fri, 08 Jan 2010)
New Revision: 16555
Modified:
kde-extras/kvirc/trunk/debian/changelog
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-data.links
kde-extras/kvirc/trunk/debian/patches/05_xpmicon.patch
kde-extras/kvirc/trunk/debian/patches/kubuntu_01_fix_desktop_entry.patch
kde-extras/kvirc/trunk/debian/rules
Log:
The ?\195?\130?\194?\187Dream Team?\195?\130?\194?\171 release.
* Copyright:
- Fixed pointer to GPLv2 in copyright file.
- More detailed and updated copyright file.
* Bump Standards-Version to 3.8.1. No changes needed.
* Added DEB_DH_ALWAYS_EXCLUDE
* Fixed installing files per package paths.
* Setting back maintainer to Debian KDE Extras Team.
* Moving manpage from kvirc-data to kvirc package. kvirc replaces kvirc-data
* Pointing upstream license path to Debian copyright file.
* Using shared-mime-info to add filetypes to system mime database.
* Synced to upstream's SVN r3240:
- Including patch from Debian to fix the xterm issue. (Closes: #530311)
- Fixes ?\195?\130?\194?\187kvirc doesn't obey LC_MESSAGES environment variable?\195?\130?\194?\171.
(Closes: #426838)
- Fixes ?\195?\130?\194?\187kvirc: embedding perl needs PERL_SYS_INIT3()?\195?\130?\194?\171 for real (upstream
changeset <https://svn.kvirc.de/kvirc/changeset/3023>). (Was bug:
#495064)
See README.Debian for a quick note on this.
- Includes OFTC/irc.debian.org in the standard server list.
- Refreshed patches.
* debian/control:
- Added zlib1g-dev, libssl-dev, libx11-dev and libxrender-dev to
Build-Depends. Three fix a FTBS, libssl-dev adds SSL support.
- Added myself to Uploaders on Ra?\195?\131?\194?\186l's invitation. Thanks!
- 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 ?\195?\130?\194?\187-DWITHOUT_PYTHON=YES?\195?\130?\194?\171, module wasn't built anyway so
far, so we can safe the buildds the tests.
* debian/TODO.Debian: Added.
* debian/source.lintian-overrides: Added.
- ?\195?\130?\194?\187kvirc source: debhelper-but-no-misc-depends?\195?\130?\194?\171 added for
kvirc-{dev,data}.
* debian/watch: Added (using ftp.kvirc.de instead of primary FTP server,
because the primary is down atm). (Issue found by lintian.)
* debian/patches: Added short explanations to the patches (thanks lintian).
* debian/kvirc-data.links: Ra?\195?\131?\194?\186l noticed, that
<file:///usr/share/kvirc/4.0/license/COPYING> didn't end up in the kvirc
package and the intended link to <file:///usr/share/doc/kvirc/copyright>
wasn't set. Added an entry to address that.
Modified: kde-extras/kvirc/trunk/debian/changelog
===================================================================
--- kde-extras/kvirc/trunk/debian/changelog 2010-01-07 15:29:23 UTC (rev 16554)
+++ kde-extras/kvirc/trunk/debian/changelog 2010-01-08 08:01:43 UTC (rev 16555)
@@ -1,5 +1,8 @@
-kvirc (4:4.0.0~svn3193-1) UNRELEASED; urgency=low
+kvirc (4:4.0.0~svn3240-1) unstable; urgency=low
+ The »Dream Team« release.
+
+ [ Raúl Sánchez Siles ]
* Fix "kvirc website, upstream 3.4.2" New upstream release. (Closes: #526886)
* rules:
- Using Debian pkg-kde-tools kde4.mk
@@ -10,28 +13,59 @@
- Removed 10_gcc4.3_fix.patch. Included upstream.
- Removed 17_awaybackaction.patch. Included upstream
- Removed 20_fixman.patch. Fixed upstream.
- * Added DEB_DH_ALWAYS_EXCLUDE
- * Fixed installing files per package paths.
- * Setting back maintainer to Debian KDE Extras Team.
+ * Copyright:
+ - Fixed pointer to GPLv2 in copyright file.
+ - More detailed and updated copyright file.
* Menu:
- Fixed menu file syntax error.
- Correctly point to 32x32 icon.
- Reworked 05_xpmicon.patch to only include 32x32 icons.
+ * Bump Standards-Version to 3.8.1. No changes needed.
+ * Added DEB_DH_ALWAYS_EXCLUDE
+ * Fixed installing files per package paths.
+ * Setting back maintainer to Debian KDE Extras Team.
* Moved desktop file from kvirc-data to kvirc package.
* Disabled coexistence with kvirc3.
- * Moving manpage from kvirc-data to kvirc package.
- * Invoke dh_desktop in rules so update-desktop-database is called
- when needed.
- * Bump Standards-Version to 3.8.1. No changes needed.
- * Add lintian override exception for kvirc menu icon.
- * Fixed pointer to GPLv2 in copyright file.
+ * Moving manpage from kvirc-data to kvirc package. kvirc replaces kvirc-data
* Fix "kvirc has circular Depends on kvirc-data". Now kvirc-data suggests
kvirc (Closes: #525037)
- * Adding license file Debian path on copyright file.
- * Removing upstream license. Already provided by package.
+ * Pointing upstream license path to Debian copyright file.
+ * Using shared-mime-info to add filetypes to system mime database.
- -- Raúl Sánchez Siles <rasasi78 at gmail.com> Wed, 25 Mar 2009 01:39:37 +0100
+ [ Kai Wasserbäch ]
+ * Synced to upstream's SVN r3240:
+ - Including patch from Debian to fix the xterm issue. (Closes: #530311)
+ - Fixes »kvirc doesn't obey LC_MESSAGES environment variable«.
+ (Closes: #426838)
+ - 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.
+ - Includes OFTC/irc.debian.org in the standard server list.
+ - Refreshed patches.
+ * debian/control:
+ - Added zlib1g-dev, libssl-dev, libx11-dev and libxrender-dev to
+ Build-Depends. Three fix a FTBS, libssl-dev adds SSL support.
+ - Added myself to Uploaders on Raúl's invitation. Thanks!
+ - 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
+ kvirc-{dev,data}.
+ * debian/watch: Added (using ftp.kvirc.de instead of primary FTP server,
+ because the primary is down atm). (Issue found by lintian.)
+ * debian/patches: Added short explanations to the patches (thanks lintian).
+ * debian/kvirc-data.links: Raúl noticed, that
+ <file:///usr/share/kvirc/4.0/license/COPYING> didn't end up in the kvirc
+ package and the intended link to <file:///usr/share/doc/kvirc/copyright>
+ wasn't set. Added an entry to address that.
+ -- Kai Wasserbäch <debian at carbon-project.org> Fri, 05 Jun 2009 01:01:01 +0200
+
kvirc (4:4.0.0~svn3039-0ubuntu2) jaunty; urgency=low
[ Alessandro Ghersi ]
Modified: kde-extras/kvirc/trunk/debian/control
===================================================================
--- kde-extras/kvirc/trunk/debian/control 2010-01-07 15:29:23 UTC (rev 16554)
+++ kde-extras/kvirc/trunk/debian/control 2010-01-08 08:01:43 UTC (rev 16555)
@@ -1,17 +1,21 @@
Source: kvirc
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.0), kdelibs5-dev, libesd0-dev, libperl-dev, pkg-kde-tools
+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
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>
+Uploaders: Raúl Sánchez Siles <rasasi78 at gmail.com>,
+ Kai Wasserbäch <debian at carbon-project.org>
Standards-Version: 3.8.1
-Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/kvirc/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kvirc/trunk
+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/
Package: kvirc
Architecture: any
-Depends: kvirc-data (= ${source:Version}), ${shlibs:Depends}
+Depends: kvirc-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Replaces: kvirc-data (<< ${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
Modified: kde-extras/kvirc/trunk/debian/copyright
===================================================================
--- kde-extras/kvirc/trunk/debian/copyright 2010-01-07 15:29:23 UTC (rev 16554)
+++ kde-extras/kvirc/trunk/debian/copyright 2010-01-08 08:01:43 UTC (rev 16555)
@@ -9,7 +9,7 @@
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
-It was downloaded from www.kvirc.de
+It was downloaded from www.kvirc.net
Upstream Author: Szymon Stefanek <kvirc at tin.it>
@@ -20,10 +20,11 @@
(see Terms and Conditions , clause 13 and 14) to its 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 Me.
+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.de
+available at http://www.kvirc.net
Have fun!
Szymon Stefanek :)
@@ -69,6 +70,8 @@
Copyright 2002-2008 Szymon Stefanek <kvirc at tin.it> and "The KVIrc
Development Team".
+--
+
src/kvirc/sparser/kvi_numeric.h:
Copyright (C) 1990 Jarkko Oikarinen
@@ -85,11 +88,17 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General Public
License can be found in `/usr/share/common-licenses/GPL'.
+--
+src/modules/my/idle.cpp
+src/modules/my/idle.h
+src/modules/my/idle_mac.cpp
+src/modules/my/idle_win.cpp
src/modules/my/idle_x11.cpp:
Copyright (C) 2003 Justin Karneges
@@ -106,11 +115,39 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
- On Debian GNU/Linux systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL'.
-
On Debian GNU/Linux systems, the complete text of the GNU Lesser General Public
License can be found in `/usr/share/common-licenses/LGPL'.
+--
+modules/FindSubversion.cmake:
+
+ 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
+
Modified: kde-extras/kvirc/trunk/debian/kvirc-data.install
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc-data.install 2010-01-07 15:29:23 UTC (rev 16554)
+++ kde-extras/kvirc/trunk/debian/kvirc-data.install 2010-01-08 08:01:43 UTC (rev 16555)
@@ -9,7 +9,4 @@
debian/tmp/usr/share/kvirc/*/msgcolors/
debian/tmp/usr/share/kvirc/*/pics/
debian/tmp/usr/share/kvirc/*/themes/
-debian/tmp/usr/share/mimelnk/applications/x-kva.desktop
-debian/tmp/usr/share/mimelnk/applications/x-kvt.desktop
-debian/tmp/usr/share/mimelnk/text/x-kvc.desktop
-debian/tmp/usr/share/mimelnk/text/x-kvs.desktop
+debian/tmp/usr/share/mime/packages/kvirc.xml
Modified: kde-extras/kvirc/trunk/debian/kvirc-data.links
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc-data.links 2010-01-07 15:29:23 UTC (rev 16554)
+++ kde-extras/kvirc/trunk/debian/kvirc-data.links 2010-01-08 08:01:43 UTC (rev 16555)
@@ -1 +1,2 @@
usr/share/man/man1/kvirc.1.gz usr/share/man/man1/kvi_make_scriptdist.sh.1.gz
+usr/share/doc/kvirc-data/copyright usr/share/kvirc/4.0/license/COPYING
Modified: kde-extras/kvirc/trunk/debian/patches/05_xpmicon.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/05_xpmicon.patch 2010-01-07 15:29:23 UTC (rev 16554)
+++ kde-extras/kvirc/trunk/debian/patches/05_xpmicon.patch 2010-01-08 08:01:43 UTC (rev 16555)
@@ -1,7 +1,14 @@
-diff --git a/data/icons/32x32/CMakeLists.txt b/data/icons/32x32/CMakeLists.txt
+This patch adds an XPM icon to the KVIrc package.
+---
+ data/icons/32x32/CMakeLists.txt | 3
+ data/icons/32x32/kvirc32x32.xpm | 295 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 298 insertions(+)
+
+Index: b/data/icons/32x32/CMakeLists.txt
+===================================================================
--- a/data/icons/32x32/CMakeLists.txt
+++ b/data/icons/32x32/CMakeLists.txt
-@@ -19,6 +19,9 @@
+@@ -19,6 +19,9 @@ IF(UNIX)
# Assume linux
INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps/)
INSTALL(FILES ${iconmime} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/mimetypes/)
@@ -11,8 +18,8 @@
ENDIF()
ELSEIF(WIN32)
INSTALL(FILES ${iconapps} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/32x32/apps/)
-diff --git a/data/icons/32x32/kvirc32x32.xpm b/data/icons/32x32/kvirc32x32.xpm
-new file mode 100644
+Index: b/data/icons/32x32/kvirc32x32.xpm
+===================================================================
--- /dev/null
+++ b/data/icons/32x32/kvirc32x32.xpm
@@ -0,0 +1,295 @@
Modified: kde-extras/kvirc/trunk/debian/patches/kubuntu_01_fix_desktop_entry.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/kubuntu_01_fix_desktop_entry.patch 2010-01-07 15:29:23 UTC (rev 16554)
+++ kde-extras/kvirc/trunk/debian/patches/kubuntu_01_fix_desktop_entry.patch 2010-01-08 08:01:43 UTC (rev 16555)
@@ -1,6 +1,13 @@
---- kvirc-4.0.0~svn3039/cmake/kvirc4.desktop.cmake.orig 2009-01-28 11:40:33.000000000 -0330
-+++ kvirc-4.0.0~svn3039/cmake/kvirc4.desktop.cmake 2009-01-28 11:41:10.000000000 -0330
-@@ -6,4 +6,4 @@
+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;
Modified: kde-extras/kvirc/trunk/debian/rules
===================================================================
--- kde-extras/kvirc/trunk/debian/rules 2010-01-07 15:29:23 UTC (rev 16554)
+++ kde-extras/kvirc/trunk/debian/rules 2010-01-08 08:01:43 UTC (rev 16555)
@@ -1,28 +1,12 @@
#! /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
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
-DEB_CMAKE_EXTRA_FLAGS += -DWANT_COEXISTENCE=OFF
+DEB_CMAKE_EXTRA_FLAGS += -DWANT_COEXISTENCE=OFF -DWITHOUT_PYTHON=YES
# -DWITH_ix86_ASM COMPILE_MMX_ASM -DCOEXISTENCE
-
-#Hook and add dh_desktop debhelper script. Taken from gnome.mk class
-ifdef _cdbs_rules_debhelper
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- $(if $(wildcard /usr/bin/dh_desktop),dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS))
-endif
-
-#Remove the upstream provided license file since it's already provided by debian copyright
-common-install-indep::
- rm -r $(CURDIR)/debian/tmp/$(DEB_CMAKE_INSTALL_PREFIX)/share/kvirc/4.0/license
-
-# #
-# # Move KDE service files to a better position
-# #
-# mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/services \
-# $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.4/
-
More information about the pkg-kde-commits
mailing list