rev 14023 - in kde-extras/kvirc/trunk/debian: . patches
Raúl Sánchez Siles
kebianizao-guest at alioth.debian.org
Sun Mar 8 23:28:16 UTC 2009
Author: kebianizao-guest
Date: 2009-03-08 23:28:16 +0000 (Sun, 08 Mar 2009)
New Revision: 14023
Added:
kde-extras/kvirc/trunk/debian/kvirc.lintian
kde-extras/kvirc/trunk/debian/patches/kubuntu_01_fix_desktop_entry.patch
Modified:
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-data.links
kde-extras/kvirc/trunk/debian/kvirc-dev.install
kde-extras/kvirc/trunk/debian/kvirc.install
kde-extras/kvirc/trunk/debian/kvirc.menu
kde-extras/kvirc/trunk/debian/patches/05_xpmicon.patch
kde-extras/kvirc/trunk/debian/patches/series
kde-extras/kvirc/trunk/debian/rules
Log:
Raw importing of kubuntu packaging. Don't use this.
Modified: kde-extras/kvirc/trunk/debian/changelog
===================================================================
--- kde-extras/kvirc/trunk/debian/changelog 2009-03-08 23:25:40 UTC (rev 14022)
+++ kde-extras/kvirc/trunk/debian/changelog 2009-03-08 23:28:16 UTC (rev 14023)
@@ -1,6 +1,33 @@
+kvirc (4:4.0.0~svn3039-0ubuntu1) jaunty; urgency=low
+
+ * SVN pre-release (2009/01/26)
+ * Update debian/copyright
+ * Update packaging to use kde4.mk and cmake
+ * Update build deps
+ * Update compat (debhelper >= 6)
+ * Update standards to 3.8.0
+ * Update *.install to comply with new standards version
+ * Fix post/pre scripts to update alternatives for irc.protocol
+ * Remove unnecessary patches
+ - 01_am_maintainer_mode.patch
+ - 02_rpath.patch
+ - 09_plugin_dir.patch
+ - 13_eula.patch
+ - 30_security-cipherlist-bad-order_r1990.patch
+ - 31_r1997-irchandler-exploit-bug503401.patch
+ - 51_PERL_SYS_INIT3_r2271-bug495064.patch
+ - 52_windowmenu-crashes_r1991.patch
+ - 98_buildprep.diff
+ * New patches
+ - kubuntu_01_fix_desktop_entry.patch
+ * Update patches
+ - 05_xpmicon.patch
+
+ -- Roderick B. Greening <roderick.greening at gmail.com> Tue, 27 Jan 2009 00:33:18 -0330
+
kvirc (2:3.4.0-3) unstable; urgency=medium
- * Try to start command via irc:// handler (Closes: #503401).
+ * try to start command via irc:// handler (Closes: #503401).
Added 31_r1997-irchandler-exploit-bug503401.patch
* Urgency medium due to potential security bug fix.
Modified: kde-extras/kvirc/trunk/debian/compat
===================================================================
--- kde-extras/kvirc/trunk/debian/compat 2009-03-08 23:25:40 UTC (rev 14022)
+++ kde-extras/kvirc/trunk/debian/compat 2009-03-08 23:28:16 UTC (rev 14023)
@@ -1 +1 @@
-4
+6
Modified: kde-extras/kvirc/trunk/debian/control
===================================================================
--- kde-extras/kvirc/trunk/debian/control 2009-03-08 23:25:40 UTC (rev 14022)
+++ kde-extras/kvirc/trunk/debian/control 2009-03-08 23:28:16 UTC (rev 14023)
@@ -1,10 +1,11 @@
Source: kvirc
-Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), kdelibs4-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake (>= 1.10), quilt
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.0), kdelibs5-dev, libesd0-dev, libperl-dev
Section: net
Priority: optional
-Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Raúl Sánchez Siles <rasasi78 at gmail.com>
-Standards-Version: 3.7.3.0
+Standards-Version: 3.8.0
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
Homepage: http://kvirc.net/
Modified: kde-extras/kvirc/trunk/debian/copyright
===================================================================
--- kde-extras/kvirc/trunk/debian/copyright 2009-03-08 23:25:40 UTC (rev 14022)
+++ kde-extras/kvirc/trunk/debian/copyright 2009-03-08 23:28:16 UTC (rev 14023)
@@ -6,6 +6,9 @@
and is licensed under the GPLv2, which can be found at
'/usr/share/common-licenses/GPL-2'.
+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.net
Upstream Author: Szymon Stefanek <kvirc at tin.it>
@@ -65,3 +68,42 @@
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
+
+ This program 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; either version 1, or (at your option)
+ any later version.
+
+ This program 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.
+
+ 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.
+
+src/modules/my/idle_x11.cpp:
+
+ Copyright (C) 2003 Justin Karneges
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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
+ Lesser General Public License for more details.
+
+ 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
+
+ On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL'.
Modified: kde-extras/kvirc/trunk/debian/kvirc-data.install
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc-data.install 2009-03-08 23:25:40 UTC (rev 14022)
+++ kde-extras/kvirc/trunk/debian/kvirc-data.install 2009-03-08 23:28:16 UTC (rev 14023)
@@ -1,16 +1,18 @@
-debian/tmp/usr/bin/kvi_run_netscape
-debian/tmp/usr/bin/kvi_search_help
-debian/tmp/usr/share/applnk/Internet/kvirc.desktop
-debian/tmp/usr/share/icons/hicolor/
-debian/tmp/usr/share/kvirc/*/config/
-debian/tmp/usr/share/kvirc/*/defscript/
-debian/tmp/usr/share/kvirc/*/help/
-debian/tmp/usr/share/kvirc/*/license/
-debian/tmp/usr/share/kvirc/*/locale/
-debian/tmp/usr/lib/kvirc/*/modules/caps/
-debian/tmp/usr/share/kvirc/*/msgcolors/
-debian/tmp/usr/share/kvirc/*/pics/
-debian/tmp/usr/share/kvirc/*/services/
-debian/tmp/usr/share/kvirc/*/themes/
-debian/tmp/usr/share/mimelnk/text/*.desktop
-debian/tmp/usr/share/man/man1/kvirc.1
+usr/share/applications/kvirc4.desktop
+usr/share/icons/hicolor/
+usr/share/pixmaps/kvirc*.xpm
+usr/share/kvirc/*/config/
+usr/share/kvirc/*/defscript/
+usr/share/kvirc/*/doc/
+usr/share/kvirc/*/help/
+usr/share/kvirc/*/license/
+usr/share/kvirc/*/locale/
+usr/share/kvirc/*/modules/caps/
+usr/share/kvirc/*/msgcolors/
+usr/share/kvirc/*/pics/
+usr/share/kvirc/*/themes/
+usr/share/man/man1/kvirc.1
+usr/share/mimelnk/applications/x-kva.desktop
+usr/share/mimelnk/applications/x-kvt.desktop
+usr/share/mimelnk/text/x-kvc.desktop
+usr/share/mimelnk/text/x-kvs.desktop
Modified: kde-extras/kvirc/trunk/debian/kvirc-data.links
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc-data.links 2009-03-08 23:25:40 UTC (rev 14022)
+++ kde-extras/kvirc/trunk/debian/kvirc-data.links 2009-03-08 23:28:16 UTC (rev 14023)
@@ -1,2 +1 @@
-usr/share/man/man1/kvirc.1.gz usr/share/man/man1/kvi_run_netscape.1.gz
-usr/share/man/man1/kvirc.1.gz usr/share/man/man1/kvi_search_help.1.gz
+usr/share/man/man1/kvirc.1.gz usr/share/man/man1/kvi_make_scriptdist.sh.1.gz
Modified: kde-extras/kvirc/trunk/debian/kvirc-dev.install
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc-dev.install 2009-03-08 23:25:40 UTC (rev 14022)
+++ kde-extras/kvirc/trunk/debian/kvirc-dev.install 2009-03-08 23:28:16 UTC (rev 14023)
@@ -1,5 +1,2 @@
-debian/tmp/usr/bin/kvirc-config
-debian/tmp/usr/include/kvirc/
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/kvirc/*/modules/*.la
+usr/bin/kvirc4-config
+usr/lib/*.so
Modified: kde-extras/kvirc/trunk/debian/kvirc.install
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc.install 2009-03-08 23:25:40 UTC (rev 14022)
+++ kde-extras/kvirc/trunk/debian/kvirc.install 2009-03-08 23:28:16 UTC (rev 14023)
@@ -1,4 +1,3 @@
-debian/overrides/kvirc usr/share/lintian/overrides
-debian/tmp/usr/bin/kvirc
-debian/tmp/usr/lib/*.so.*
-debian/tmp/usr/lib/kvirc/*/modules/*.so
+usr/bin/kvirc4
+usr/lib/*.so.*
+usr/lib/kvirc/*/modules/*.so
Added: kde-extras/kvirc/trunk/debian/kvirc.lintian
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc.lintian (rev 0)
+++ kde-extras/kvirc/trunk/debian/kvirc.lintian 2009-03-08 23:28:16 UTC (rev 14023)
@@ -0,0 +1 @@
+kvirc: binary-without-manpage kvirc
Modified: kde-extras/kvirc/trunk/debian/kvirc.menu
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc.menu 2009-03-08 23:25:40 UTC (rev 14022)
+++ kde-extras/kvirc/trunk/debian/kvirc.menu 2009-03-08 23:28:16 UTC (rev 14023)
@@ -2,6 +2,8 @@
needs="x11"\
section="Applications/Network/Communication"\
title="KVIrc"\
- command="/usr/bin/kvirc"\
- hints="irc,scripting"\
- icon="/usr/share/icons/hicolor/32x32/apps/kvirc.xpm"
+ command="/usr/bin/kvirc4"\
+ hints="KDE,irc,scripting"\
+ icon="/usr/share/pixmaps/kvirc32x32.xpm"\
+ icon32x32="/usr/share/pixmaps/kvirc32x32.xpm"\
+ icon48x48="/usr/share/pixmaps/kvirc48x48.xpm"\
Modified: kde-extras/kvirc/trunk/debian/patches/05_xpmicon.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/05_xpmicon.patch 2009-03-08 23:25:40 UTC (rev 14022)
+++ kde-extras/kvirc/trunk/debian/patches/05_xpmicon.patch 2009-03-08 23:28:16 UTC (rev 14023)
@@ -1,6 +1,6 @@
-diff -Nur kvirc/data/icons/32x32/kvirc.xpm kvirc.new/data/icons/32x32/kvirc.xpm
---- kvirc/data/icons/32x32/kvirc.xpm 1970-01-01 01:00:00.000000000 +0100
-+++ kvirc.new/data/icons/32x32/kvirc.xpm 2005-02-09 12:31:44.000000000 +0100
+diff -Nur kvirc/data/icons/32x32/kvirc32x32.xpm kvirc.new/data/icons/32x32/kvirc32x32.xpm
+--- kvirc/data/icons/32x32/kvirc32x32.xpm 1970-01-01 01:00:00.000000000 +0100
++++ kvirc.new/data/icons/32x32/kvirc32x32.xpm 2005-02-09 12:31:44.000000000 +0100
@@ -0,0 +1,295 @@
+/* XPM */
+static char *kvirc3[] = {
@@ -297,19 +297,9 @@
+"YXYXYXYXYXYXYXYXYXYXYXYX % t t t u & YXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX o o o o YXYXYXYXYXYXYXYXYXYXYXYX"
+};
-diff -Nur kvirc/data/icons/32x32/Makefile.am kvirc.new/data/icons/32x32/Makefile.am
---- kvirc/data/icons/32x32/Makefile.am 2003-02-25 09:46:27.000000000 +0100
-+++ kvirc.new/data/icons/32x32/Makefile.am 2005-02-09 17:13:00.000000000 +0100
-@@ -1,4 +1,5 @@
--iconapps32data_DATA = kvirc.png
-+iconapps32data_DATA = kvirc.png \
-+ kvirc.xpm
-
- iconmime32data_DATA = kvs.png
-
-diff -Nur kvirc/data/icons/48x48/kvirc.xpm kvirc.new/data/icons/48x48/kvirc.xpm
---- kvirc/data/icons/48x48/kvirc.xpm 1970-01-01 01:00:00.000000000 +0100
-+++ kvirc.new/data/icons/48x48/kvirc.xpm 2005-02-09 12:32:20.000000000 +0100
+diff -Nur kvirc/data/icons/48x48/kvirc48x48.xpm kvirc.new/data/icons/48x48/kvirc48x48.xpm
+--- kvirc/data/icons/48x48/kvirc48x48.xpm 1970-01-01 01:00:00.000000000 +0100
++++ kvirc.new/data/icons/48x48/kvirc48x48.xpm 2005-02-09 12:32:20.000000000 +0100
@@ -0,0 +1,311 @@
+/* XPM */
+static char *kvirc3[] = {
@@ -622,11 +612,29 @@
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX X # # # # # # X YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};
-diff -Nur kvirc/data/icons/48x48/Makefile.am kvirc.new/data/icons/48x48/Makefile.am
---- kvirc/data/icons/48x48/Makefile.am 2003-02-25 09:46:27.000000000 +0100
-+++ kvirc.new/data/icons/48x48/Makefile.am 2005-02-09 17:13:29.000000000 +0100
-@@ -1,4 +1,4 @@
--iconapps48data_DATA = kvirc.png
-+iconapps48data_DATA = kvirc.png kvirc.xpm
-
- iconmime48data_DATA = kvs.png
+diff -Nur kvirc/data/icons/32x32/CMakeLists.txt kvirc.new/data/icons/32x32/CMakeLists.txt
+--- kvirc/data/icons/32x32/CMakeLists.txt 2009-01-28 11:51:40.000000000 -0330
++++ kvirc.new/data/icons/32x32/CMakeLists.txt 2009-01-28 11:54:40.000000000 -0330
+@@ -8,6 +8,9 @@
+ ELSE()
+ # Assume linux
+ INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/)
++ # Install xpm for ${CMAKE_INSTALL_PREFIX}/share/menu/kvirc
++ FILE(GLOB files "*.xpm")
++ INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps/)
+ ENDIF()
+ ELSEIF(WIN32)
+ INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/32x32/)
+diff -Nur kvirc/data/icons/48x48/CMakeLists.txt kvirc.new/data/icons/48x48/CMakeLists.txt
+--- kvirc/data/icons/48x48/CMakeLists.txt 2009-01-28 11:51:40.000000000 -0330
++++ kvirc.new/data/icons/48x48/CMakeLists.txt 2009-01-28 11:54:40.000000000 -0330
+@@ -8,6 +8,9 @@
+ ELSE()
+ # Assume linux
+ INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/)
++ # Install xpm for ${CMAKE_INSTALL_PREFIX}/share/menu/kvirc
++ FILE(GLOB files "*.xpm")
++ INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps/)
+ ENDIF()
+ ELSEIF(WIN32)
+ INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/48x48/)
Added: kde-extras/kvirc/trunk/debian/patches/kubuntu_01_fix_desktop_entry.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/kubuntu_01_fix_desktop_entry.patch (rev 0)
+++ kde-extras/kvirc/trunk/debian/patches/kubuntu_01_fix_desktop_entry.patch 2009-03-08 23:28:16 UTC (rev 14023)
@@ -0,0 +1,8 @@
+--- 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 @@
+ Icon=kvirc
+ Type=Application
+ MimeType=application/x-kva;application/x-kvt;
+-Categories=Qt;Network;IRCClient;
++Categories=Qt;KDE;Network;IRCClient;
Modified: kde-extras/kvirc/trunk/debian/patches/series
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/series 2009-03-08 23:25:40 UTC (rev 14022)
+++ kde-extras/kvirc/trunk/debian/patches/series 2009-03-08 23:28:16 UTC (rev 14023)
@@ -1,13 +1,5 @@
-01_am_maintainer_mode.patch
-02_rpath.patch
05_xpmicon.patch
-09_plugin_dir.patch
10_gcc4.3_fix.patch
-13_eula.patch
17_awaybackaction.patch
20_fixman.patch
-30_security-cipherlist-bad-order_r1990.patch
-31_r1997-irchandler-exploit-bug503401.patch
-51_PERL_SYS_INIT3_r2271-bug495064.patch
-52_windowmenu-crashes_r1991.patch
-98_buildprep.diff -p0
+kubuntu_01_fix_desktop_entry.patch
Modified: kde-extras/kvirc/trunk/debian/rules
===================================================================
--- kde-extras/kvirc/trunk/debian/rules 2009-03-08 23:25:40 UTC (rev 14022)
+++ kde-extras/kvirc/trunk/debian/rules 2009-03-08 23:28:16 UTC (rev 14023)
@@ -1,69 +1,4 @@
#! /usr/bin/make -f
#
-# Build script for the KVIrc 3 debian package.
-# Using Common Debian Build System (CDBS).
-#
- #
- # Update Makefiles
- #
- # This is done outside of debian/rules now, so that Debian autobuilders
- # will all be building the same source, with no deviation because they
- # might have an outdated autotools-dev version.
-#common-configure-impl::
-# ./autogen.sh
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
- #
- # Specify extra configure options:
- #
-DEB_CONFIGURE_EXTRA_FLAGS := --with-fno-rtti --with-aa-fonts --with-big-channels
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-perl --with-pic --enable-wall --mandir=$(DEB_CONFIGURE_MANDIR)
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath
-
- #
- # If debug is specified, turn it on
- #
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- DEB_CONFIGURE_EXTRA_FLAGS += --enable-debug --with-memory-profile --with-memory-checks
-else
- #DEB_CONFIGURE_EXTRA_FLAGS += --enable-optimisation=3
- ifneq (,$(findstring 86,$(DEB_BUILD_GNU_CPU)))
- # DEB_CONFIGURE_EXTRA_FLAGS += --enable-pipes --enable-objprelink
- DEB_CONFIGURE_EXTRA_FLAGS +=--with-ix86-asm
- endif
-endif
-
- #
- # Don't compress these files
- #
-DEB_COMPRESS_EXCLUDE := .kvs
-
- #
- # Run dh_shlibdeps with the correct options
- #
-DEB_SHLIBDEPS_INCLUDE_kvirc := debian/kvirc$(DEB_CONFIGURE_PREFIX)/lib
-DEB_SHLIBDEPS_LIBRARY_kvirc := kvirc
-
- #
- # Documentation to include for each package
- #
-DEB_INSTALL_DOCS_kvirc := FAQ README TODO
-DEB_INSTALL_DOCS_kvirc-dev := doc/scriptexamples
-DEB_INSTALL_DOCS_ALL := -XCVS -X.cvsignore
-
-common-install-indep::
- #
- # Change the name of the COPYING file to appease lintian
- #
- mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.4/license/COPYING \
- $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.4/license/EULA
- #
- # 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/
-
+include /usr/share/cdbs/1/class/kde4.mk
Property changes on: kde-extras/kvirc/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
- *
More information about the pkg-kde-commits
mailing list