rev 4316 - in kde-extras/kscope: tags/1.4.0-1/debian trunk/debian
trunk/debian/patches
Fathi Boudra
fboudra-guest at costa.debian.org
Sat Aug 12 19:08:07 UTC 2006
Author: fboudra-guest
Date: 2006-08-12 19:08:06 +0000 (Sat, 12 Aug 2006)
New Revision: 4316
Added:
kde-extras/kscope/tags/1.4.0-1/debian/kscope.xml
kde-extras/kscope/trunk/debian/kscope.xml
kde-extras/kscope/trunk/debian/patches/10_kdepot.diff
kde-extras/kscope/trunk/debian/patches/11_crashfix.diff
Removed:
kde-extras/kscope/trunk/debian/kscope.1.docbook
kde-extras/kscope/trunk/debian/patches/kubuntu_02_crashfix.diff
Modified:
kde-extras/kscope/tags/1.4.0-1/debian/changelog
kde-extras/kscope/tags/1.4.0-1/debian/control
kde-extras/kscope/tags/1.4.0-1/debian/copyright
kde-extras/kscope/tags/1.4.0-1/debian/rules
kde-extras/kscope/trunk/debian/changelog
kde-extras/kscope/trunk/debian/control
kde-extras/kscope/trunk/debian/copyright
kde-extras/kscope/trunk/debian/rules
Log:
Merge kubuntu package (patches and manpage) and update tagged kscope 1.4.0-1
Modified: kde-extras/kscope/tags/1.4.0-1/debian/changelog
===================================================================
--- kde-extras/kscope/tags/1.4.0-1/debian/changelog 2006-08-12 17:27:18 UTC (rev 4315)
+++ kde-extras/kscope/tags/1.4.0-1/debian/changelog 2006-08-12 19:08:06 UTC (rev 4316)
@@ -1,6 +1,10 @@
kscope (1.4.0-1) unstable; urgency=low
* New upstream release
+ * Merge kubuntu patches, thanks to Tom Albers <tomalbers at kde.nl>
+ * Add kscope manpage from kubuntu package,
+ thanks to Jonathan Patrick Davies <jpatrick at ubuntu.com>
+ * Update copyright file: add kscope manpage license
-- Fathi Boudra <fboudra at free.fr> Thu, 10 Aug 2006 14:42:31 +0200
Modified: kde-extras/kscope/tags/1.4.0-1/debian/control
===================================================================
--- kde-extras/kscope/tags/1.4.0-1/debian/control 2006-08-12 17:27:18 UTC (rev 4315)
+++ kde-extras/kscope/tags/1.4.0-1/debian/control 2006-08-12 19:08:06 UTC (rev 4316)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), bison, flex, kdebase-dev
+Build-Depends: cdbs, debhelper (>= 5), bison, flex, kdebase-dev, docbook2x
Standards-Version: 3.7.2
Package: kscope
Modified: kde-extras/kscope/tags/1.4.0-1/debian/copyright
===================================================================
--- kde-extras/kscope/tags/1.4.0-1/debian/copyright 2006-08-12 17:27:18 UTC (rev 4315)
+++ kde-extras/kscope/tags/1.4.0-1/debian/copyright 2006-08-12 19:08:06 UTC (rev 4316)
@@ -5,8 +5,30 @@
Copyright Holder: Elad Lahav <elad_lahav at users.sf.net>
-License:
+The kscope manpage is (C) 2006 Jonathan Patrick Davies <jpatrick at ubuntu.com>
+and is licensed under the GPL, see below.
+manpage license:
+
+ 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; either version 2 of the License, or
+ (at your option) any later version.
+
+ 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.
+
+ 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
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+kscope license:
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
Added: kde-extras/kscope/tags/1.4.0-1/debian/kscope.xml
===================================================================
--- kde-extras/kscope/tags/1.4.0-1/debian/kscope.xml 2006-08-12 17:27:18 UTC (rev 4315)
+++ kde-extras/kscope/tags/1.4.0-1/debian/kscope.xml 2006-08-12 19:08:06 UTC (rev 4316)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+]>
+<refentry>
+ <refentryinfo>
+ <author>
+ <firstname>Jonathan Patrick</firstname>
+ <surname>Davies</surname>
+ <email>jpatrick at ubuntu.com</email>
+ </author>
+ <copyright>
+ <year>2006</year>
+ <holder>Jonathan Patrick Davies</holder>
+ </copyright>
+ <!-- XXX IMPORTANT XXX -->
+ <!-- Keep this date up to date: -->
+ <date>2006-02-18</date>
+ <!-- ^^^^^^^^^^ -->
+ </refentryinfo>
+ <refmeta>
+ <refentrytitle>kscope</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+ <refnamediv>
+ <refname>kscope</refname>
+ <refpurpose>a source browsing and editing environment</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>kscope</command>
+ <arg choice="opt">
+ <option><replaceable>Qt-options</replaceable></option>
+ </arg>
+ <arg choice="opt">
+ <option><replaceable>KDE-options</replaceable></option>
+ </arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>
+ KScope is a source browsing and editing environment for large projects written
+ in C (such as the Linux kernel).
+ </para>
+ <para>
+ KScope uses the Cscope code analysis engine to provide valuable information to
+ coders.
+ </para>
+ <para>
+ KScope also provides call-tree and call-graph views that can help developers
+ by visualising the relationships between different functions in the code base.
+ </para>
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+ <para>
+ All <productname>KDE</productname> and <productname>Qt</productname>
+ programs accept a some common command-line options. KScope has no
+ application-specific options.
+ </para>
+ <para>
+ <variablelist>
+ <title>Generic options:</title>
+ <varlistentry>
+ <term> <option>--help</option> </term>
+ <listitem> <para>Show help about options</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--help-qt</option> </term>
+ <listitem> <para>Show Qt specific options</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--help-kde</option> </term>
+ <listitem> <para>Show KDE specific options</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--help-all</option> </term>
+ <listitem> <para>Show all options</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--author</option> </term>
+ <listitem> <para>Show author information</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>-v</option>, <option>--version</option> </term>
+ <listitem> <para>Show version information</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--license</option> </term>
+ <listitem> <para>Show license information</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--</option> </term>
+ <listitem> <para>Indicates end of options</para> </listitem>
+ </varlistentry>
+ </variablelist>
+ <!-- TODO * add all the rest of the options, but maybe find an automated
+ way to keep it up to date -->
+ </para>
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+ <para>
+ KScope was written by Elad Lahav <email>elad_lahav at users.sf.net</email>.
+ </para>
+ </refsect1>
+ <refsect1>
+ <title>COPYRIGHT</title>
+ <para>
+ This manual page was written by Jonathan Patrick Davies
+ <email>jpatrick at ubuntu.com</email> for the
+ <productname>Ubuntu</productname> system (but may be used by others).
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the <acronym>GNU</acronym> General Public License,
+ Version 2 or any later version published by the Free Software Foundation.
+ </para>
+ <para>
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in
+ <filename>/usr/share/common-licenses/GPL</filename>.
+ </para>
+ </refsect1>
+</refentry>
Modified: kde-extras/kscope/tags/1.4.0-1/debian/rules
===================================================================
--- kde-extras/kscope/tags/1.4.0-1/debian/rules 2006-08-12 17:27:18 UTC (rev 4315)
+++ kde-extras/kscope/tags/1.4.0-1/debian/rules 2006-08-12 19:08:06 UTC (rev 4316)
@@ -2,4 +2,20 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+DEB_INSTALL_MANPAGES_kscope := kscope.1
+
+build/kscope::
+ /usr/bin/docbook2x-man debian/kscope.xml
+
+install/kscope::
+ install -D -p -m0644 src/kscope.desktop \
+ debian/kscope/usr/share/applications/kde/kscope.desktop
+
+binary-post-install/kscope::
+ rm -rf debian/kscope/usr/share/applnk/
+
+
+clean::
+ rm -f kscope.1
Modified: kde-extras/kscope/trunk/debian/changelog
===================================================================
--- kde-extras/kscope/trunk/debian/changelog 2006-08-12 17:27:18 UTC (rev 4315)
+++ kde-extras/kscope/trunk/debian/changelog 2006-08-12 19:08:06 UTC (rev 4316)
@@ -1,14 +1,13 @@
kscope (1.4.0-1) unstable; urgency=low
- [ Fathi Boudra ]
* New upstream release
+ * Merge kubuntu patches, thanks to Tom Albers <tomalbers at kde.nl>
+ * Add kscope manpage from kubuntu package,
+ thanks to Jonathan Patrick Davies <jpatrick at ubuntu.com>
+ * Update copyright file: add kscope manpage license
- [ Tom Albers ]
- * added patch to prevent crash in go/next and go/previous
- * added the manpage found in kubuntu's package
+ -- Fathi Boudra <fboudra at free.fr> Thu, 10 Aug 2006 14:42:31 +0200
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sat, 12 Aug 2006 19:22:43 +0200
-
kscope (1.3.4-1) unstable; urgency=low
* Initial release (Closes: #309669)
Modified: kde-extras/kscope/trunk/debian/control
===================================================================
--- kde-extras/kscope/trunk/debian/control 2006-08-12 17:27:18 UTC (rev 4315)
+++ kde-extras/kscope/trunk/debian/control 2006-08-12 19:08:06 UTC (rev 4316)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), bison, flex, kdebase-dev
+Build-Depends: cdbs, debhelper (>= 5), bison, flex, kdebase-dev, docbook2x
Standards-Version: 3.7.2
Package: kscope
Modified: kde-extras/kscope/trunk/debian/copyright
===================================================================
--- kde-extras/kscope/trunk/debian/copyright 2006-08-12 17:27:18 UTC (rev 4315)
+++ kde-extras/kscope/trunk/debian/copyright 2006-08-12 19:08:06 UTC (rev 4316)
@@ -5,8 +5,30 @@
Copyright Holder: Elad Lahav <elad_lahav at users.sf.net>
-License:
+The kscope manpage is (C) 2006 Jonathan Patrick Davies <jpatrick at ubuntu.com>
+and is licensed under the GPL, see below.
+manpage license:
+
+ 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; either version 2 of the License, or
+ (at your option) any later version.
+
+ 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.
+
+ 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
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+kscope license:
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
Deleted: kde-extras/kscope/trunk/debian/kscope.1.docbook
Added: kde-extras/kscope/trunk/debian/kscope.xml
===================================================================
--- kde-extras/kscope/trunk/debian/kscope.xml 2006-08-12 17:27:18 UTC (rev 4315)
+++ kde-extras/kscope/trunk/debian/kscope.xml 2006-08-12 19:08:06 UTC (rev 4316)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+]>
+<refentry>
+ <refentryinfo>
+ <author>
+ <firstname>Jonathan Patrick</firstname>
+ <surname>Davies</surname>
+ <email>jpatrick at ubuntu.com</email>
+ </author>
+ <copyright>
+ <year>2006</year>
+ <holder>Jonathan Patrick Davies</holder>
+ </copyright>
+ <!-- XXX IMPORTANT XXX -->
+ <!-- Keep this date up to date: -->
+ <date>2006-02-18</date>
+ <!-- ^^^^^^^^^^ -->
+ </refentryinfo>
+ <refmeta>
+ <refentrytitle>kscope</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+ <refnamediv>
+ <refname>kscope</refname>
+ <refpurpose>a source browsing and editing environment</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>kscope</command>
+ <arg choice="opt">
+ <option><replaceable>Qt-options</replaceable></option>
+ </arg>
+ <arg choice="opt">
+ <option><replaceable>KDE-options</replaceable></option>
+ </arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>
+ KScope is a source browsing and editing environment for large projects written
+ in C (such as the Linux kernel).
+ </para>
+ <para>
+ KScope uses the Cscope code analysis engine to provide valuable information to
+ coders.
+ </para>
+ <para>
+ KScope also provides call-tree and call-graph views that can help developers
+ by visualising the relationships between different functions in the code base.
+ </para>
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+ <para>
+ All <productname>KDE</productname> and <productname>Qt</productname>
+ programs accept a some common command-line options. KScope has no
+ application-specific options.
+ </para>
+ <para>
+ <variablelist>
+ <title>Generic options:</title>
+ <varlistentry>
+ <term> <option>--help</option> </term>
+ <listitem> <para>Show help about options</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--help-qt</option> </term>
+ <listitem> <para>Show Qt specific options</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--help-kde</option> </term>
+ <listitem> <para>Show KDE specific options</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--help-all</option> </term>
+ <listitem> <para>Show all options</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--author</option> </term>
+ <listitem> <para>Show author information</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>-v</option>, <option>--version</option> </term>
+ <listitem> <para>Show version information</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--license</option> </term>
+ <listitem> <para>Show license information</para> </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> <option>--</option> </term>
+ <listitem> <para>Indicates end of options</para> </listitem>
+ </varlistentry>
+ </variablelist>
+ <!-- TODO * add all the rest of the options, but maybe find an automated
+ way to keep it up to date -->
+ </para>
+ </refsect1>
+ <refsect1>
+ <title>AUTHOR</title>
+ <para>
+ KScope was written by Elad Lahav <email>elad_lahav at users.sf.net</email>.
+ </para>
+ </refsect1>
+ <refsect1>
+ <title>COPYRIGHT</title>
+ <para>
+ This manual page was written by Jonathan Patrick Davies
+ <email>jpatrick at ubuntu.com</email> for the
+ <productname>Ubuntu</productname> system (but may be used by others).
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the <acronym>GNU</acronym> General Public License,
+ Version 2 or any later version published by the Free Software Foundation.
+ </para>
+ <para>
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in
+ <filename>/usr/share/common-licenses/GPL</filename>.
+ </para>
+ </refsect1>
+</refentry>
Added: kde-extras/kscope/trunk/debian/patches/10_kdepot.diff
===================================================================
--- kde-extras/kscope/trunk/debian/patches/10_kdepot.diff 2006-08-12 17:27:18 UTC (rev 4315)
+++ kde-extras/kscope/trunk/debian/patches/10_kdepot.diff 2006-08-12 19:08:06 UTC (rev 4316)
@@ -0,0 +1,11 @@
+--- ./admin/cvs.sh 2005-03-08 22:28:11.000000000 +0100
++++ ./admin/cvs.sh 2006-04-15 16:25:20.000000000 +0200
+@@ -499,6 +499,8 @@
+ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
+ export EXTRACTRC PREPARETIPS
+
++kdepotpath=/usr/include/kde/kde.pot
++
+ for subdir in $dirs; do
+ test -z "$VERBOSE" || echo "Making messages in $subdir"
+ (cd $subdir
Added: kde-extras/kscope/trunk/debian/patches/11_crashfix.diff
===================================================================
--- kde-extras/kscope/trunk/debian/patches/11_crashfix.diff 2006-08-12 17:27:18 UTC (rev 4315)
+++ kde-extras/kscope/trunk/debian/patches/11_crashfix.diff 2006-08-12 19:08:06 UTC (rev 4316)
@@ -0,0 +1,12 @@
+--- ./src/queryview.cpp 2005-12-23 23:22:59.000000000 +0100
++++ ./src/queryview.cpp 2006-08-12 14:10:27.000000000 +0200
+@@ -106,6 +106,9 @@
+ */
+ void QueryView::select(QListViewItem* pItem)
+ {
++ if (!pItem)
++ return;
++
+ ensureItemVisible(pItem);
+ setSelected(pItem, true);
+ slotRecordSelected(pItem);
Deleted: kde-extras/kscope/trunk/debian/patches/kubuntu_02_crashfix.diff
Modified: kde-extras/kscope/trunk/debian/rules
===================================================================
--- kde-extras/kscope/trunk/debian/rules 2006-08-12 17:27:18 UTC (rev 4315)
+++ kde-extras/kscope/trunk/debian/rules 2006-08-12 19:08:06 UTC (rev 4316)
@@ -1,16 +1,21 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/kde.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/kde.mk
-DEB_INSTALL_MANPAGES_kscope = kscope.1
+DEB_INSTALL_MANPAGES_kscope := kscope.1
build/kscope::
- docbook2x-man debian/kscope.1.docbook
+ /usr/bin/docbook2x-man debian/kscope.xml
install/kscope::
- dh_install src/kscope.desktop /usr/share/applications/kde
+ install -D -p -m0644 src/kscope.desktop \
+ debian/kscope/usr/share/applications/kde/kscope.desktop
+binary-post-install/kscope::
+ rm -rf debian/kscope/usr/share/applnk/
+
+
clean::
rm -f kscope.1
More information about the pkg-kde-commits
mailing list