rev 5218 - in kde-extras/kslovar/trunk: . debian debian/patches
ZhengPeng Hou
zhengpeng-guest at alioth.debian.org
Tue Jan 2 14:52:29 CET 2007
Author: zhengpeng-guest
Date: 2007-01-02 14:51:58 +0100 (Tue, 02 Jan 2007)
New Revision: 5218
Added:
kde-extras/kslovar/trunk/debian/
kde-extras/kslovar/trunk/debian/changelog
kde-extras/kslovar/trunk/debian/compat
kde-extras/kslovar/trunk/debian/control
kde-extras/kslovar/trunk/debian/copyright
kde-extras/kslovar/trunk/debian/docs
kde-extras/kslovar/trunk/debian/kslovar.1.docbook
kde-extras/kslovar/trunk/debian/patches/
kde-extras/kslovar/trunk/debian/patches/00list
kde-extras/kslovar/trunk/debian/patches/kubuntu_10_correct_compile_error.dpatch
kde-extras/kslovar/trunk/debian/rules
kde-extras/kslovar/trunk/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: kde-extras/kslovar/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: kde-extras/kslovar/trunk/debian/changelog
===================================================================
--- kde-extras/kslovar/trunk/debian/changelog 2007-01-02 13:45:58 UTC (rev 5217)
+++ kde-extras/kslovar/trunk/debian/changelog 2007-01-02 13:51:58 UTC (rev 5218)
@@ -0,0 +1,6 @@
+kslovar (0.2.6-1) unstable; urgency=low
+
+ * Initial release Closes: #361660
+
+ -- ZhengPeng Hou <zhengpeng-hou at ubuntu.com> Tue, 2 Jan 2007 18:47:41 +0800
+
Added: kde-extras/kslovar/trunk/debian/compat
===================================================================
--- kde-extras/kslovar/trunk/debian/compat 2007-01-02 13:45:58 UTC (rev 5217)
+++ kde-extras/kslovar/trunk/debian/compat 2007-01-02 13:51:58 UTC (rev 5218)
@@ -0,0 +1 @@
+5
Added: kde-extras/kslovar/trunk/debian/control
===================================================================
--- kde-extras/kslovar/trunk/debian/control 2007-01-02 13:45:58 UTC (rev 5217)
+++ kde-extras/kslovar/trunk/debian/control 2007-01-02 13:51:58 UTC (rev 5218)
@@ -0,0 +1,18 @@
+Source: kslovar
+Section: kde
+Priority: optional
+Maintainer: ZhengPeng Hou <zhengpeng-hou at ubuntu.com>
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, kdelibs4-dev, libxslt1-dev, libxml2-dev, docbook2x, dpatch, libsqlite3-dev
+Standards-Version: 3.7.2
+
+Package: kslovar
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsqlite3-0
+Description: A program create and edit dictionaries
+ A KDE dictionary application that can
+ read, add, and modify various dictionaries.
+ It will be capable to upload and download it
+ from a central server. It also has multi-language
+ support and Style support.
+ .
+ Homepage: http://developer.berlios.de/projects/kslovar
Added: kde-extras/kslovar/trunk/debian/copyright
===================================================================
--- kde-extras/kslovar/trunk/debian/copyright 2007-01-02 13:45:58 UTC (rev 5217)
+++ kde-extras/kslovar/trunk/debian/copyright 2007-01-02 13:51:58 UTC (rev 5218)
@@ -0,0 +1,27 @@
+This package was debianized by Hou ZhengPeng <zhengpeng.hou at gmail.com> on
+Sun, 9 Apr 2006 19:50:55 +0800.
+
+It was downloaded http://developer.berlios.de/projects/kslovar
+
+Upstream Authors:Gregor Kališnik <gregor at podnapisi.net>
+
+Copyright:
+ Copyright (C) 2005 by Gregor Kališnik <gregor at podnapisi.net>
+
+License:
+ 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 2 of the License, 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.,51 Franklin Street, 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-2'.
Added: kde-extras/kslovar/trunk/debian/docs
===================================================================
--- kde-extras/kslovar/trunk/debian/docs 2007-01-02 13:45:58 UTC (rev 5217)
+++ kde-extras/kslovar/trunk/debian/docs 2007-01-02 13:51:58 UTC (rev 5218)
@@ -0,0 +1,2 @@
+README
+
Added: kde-extras/kslovar/trunk/debian/kslovar.1.docbook
===================================================================
--- kde-extras/kslovar/trunk/debian/kslovar.1.docbook 2007-01-02 13:45:58 UTC (rev 5217)
+++ kde-extras/kslovar/trunk/debian/kslovar.1.docbook 2007-01-02 13:51:58 UTC (rev 5218)
@@ -0,0 +1,122 @@
+<?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>ZhengPeng</firstname>
+ <surname>Hou</surname>
+ <email>zhengpeng-hou at ubuntu.com</email>
+ </author>
+ <copyright>
+ <year>2006</year>
+ <holder>ZhengPeng Hou</holder>
+ </copyright>
+ <!-- XXX IMPORTANT XXX -->
+ <!-- Keep this date up to date: -->
+ <date>2006-04-09</date>
+ <!-- ^^^^^^^^^^ -->
+ </refentryinfo>
+ <refmeta>
+ <refentrytitle>kslovar</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+ <refnamediv>
+ <refname>kslovar</refname>
+ <refpurpose>A program that can create and edit dictionaries</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>kautoclick</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>
+ A KDE dictionary application that can read, add, and modify
+ various dictionaries.It will be capable to upload and
+ download it from a central server. It also has multi-language
+ support and Style support.
+ </para>
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+ <para>
+ All <productname>KDE</productname> and <productname>Qt</productname>
+ programs accept a some common command-line options. Kslovar 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>COPYRIGHT</title>
+ <para>
+ This manual page was written by ZhengPeng Hou
+ <email>zhengpeng-hou 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-2</filename>.
+ </para>
+ </refsect1>
+ <refsect1>
+ <title>Author</title>
+ <para>
+ This program was developed by Gregor Kališnik
+ <email>gregor at podnapisi.net</email> under the terms of
+ the <acronym>GNU</acronym> General Public License,
+ Version 2 or any later version published by
+ the Free Software Foundation.
+ </para>
+ </refsect1>
+</refentry>
Added: kde-extras/kslovar/trunk/debian/patches/00list
===================================================================
--- kde-extras/kslovar/trunk/debian/patches/00list 2007-01-02 13:45:58 UTC (rev 5217)
+++ kde-extras/kslovar/trunk/debian/patches/00list 2007-01-02 13:51:58 UTC (rev 5218)
@@ -0,0 +1 @@
+#kubuntu_10_correct_compile_error.dpatch
Added: kde-extras/kslovar/trunk/debian/patches/kubuntu_10_correct_compile_error.dpatch
===================================================================
--- kde-extras/kslovar/trunk/debian/patches/kubuntu_10_correct_compile_error.dpatch 2007-01-02 13:45:58 UTC (rev 5217)
+++ kde-extras/kslovar/trunk/debian/patches/kubuntu_10_correct_compile_error.dpatch 2007-01-02 13:51:58 UTC (rev 5218)
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kubuntu_10_correct_compile_error.dpatch by <zhengpeng.hou at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: switching default parameter "null" into QString::null
+
+ at DPATCH@
+diff -ruNad kslovar-0.2.1-orig/src/handler/ksxslhandler.cpp kslovar-0.2.1/src/handler/ksxslhandler.cpp
+--- kslovar-0.2.1-orig/src/handler/ksxslhandler.cpp 2006-04-10 10:47:32.000000000 +0800
++++ kslovar-0.2.1/src/handler/ksxslhandler.cpp 2006-04-10 10:48:32.000000000 +0800
+@@ -139,7 +139,7 @@
+ input.close();
+ }
+
+- if(style == "null")
++ if(style.isNull())
+ {
+ style = Configuration::dictionaryStyle();
+ }
+diff -ruNad kslovar-0.2.1-orig/src/handler/ksxslhandler.h kslovar-0.2.1/src/handler/ksxslhandler.h
+--- kslovar-0.2.1-orig/src/handler/ksxslhandler.h 2006-04-10 10:27:04.000000000 +0800
++++ kslovar-0.2.1/src/handler/ksxslhandler.h 2006-04-10 10:29:24.000000000 +0800
+@@ -21,9 +21,10 @@
+ #define KSXMLHANDLER_H
+
+
+-class QString;
+ class QCString;
+
++#include <qstring.h>
++
+ /**
+ * @short Class for merging XML and XSLT into HTML.
+ * @author Gregor Kališnik <gregor at podnapisi.net>
+@@ -41,7 +42,7 @@
+ * @param document Path to the XSLT document (style).
+ * @param style Currently used style. Used for correct parsing (replacing {...} strings). DEFAULT: "null"
+ */
+- void setXSL(const QString &document, QString style = "null");
++ void setXSL(const QString &document, QString style = QString::null);
+ /**
+ * Merges XML and XSLT and produces HTML.
+ * @param xmlString XML string to merge.
Added: kde-extras/kslovar/trunk/debian/rules
===================================================================
--- kde-extras/kslovar/trunk/debian/rules 2007-01-02 13:45:58 UTC (rev 5217)
+++ kde-extras/kslovar/trunk/debian/rules 2007-01-02 13:51:58 UTC (rev 5218)
@@ -0,0 +1,79 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+config.status: patch configure
+ dh_testdir
+ # Add here commands to configure the package.
+ CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-rpath
+
+
+build: build-stamp
+build-stamp: config.status
+ dh_testdir
+ # Add here commands to compile the package.
+ $(MAKE)
+ docbook2x-man debian/kslovar.1.docbook
+ touch build-stamp
+
+clean: clean-patched unpatch
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ rm -f kslovar.1
+ # Add here commands to clean up after the build process.
+ -$(MAKE) distclean
+ dh_clean
+
+patch: patch-stamp
+patch-stamp:
+ dpatch apply-all
+
+unpatch:
+ dpatch deapply-all
+ rm -rf patch-stamp debian/patched
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ # Add here commands to install the package into debian/kslovar.
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/kslovar
+
+binary-indep: build install
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
+ dh_installman kslovar.1
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: kde-extras/kslovar/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: kde-extras/kslovar/trunk/debian/watch
===================================================================
--- kde-extras/kslovar/trunk/debian/watch 2007-01-02 13:45:58 UTC (rev 5217)
+++ kde-extras/kslovar/trunk/debian/watch 2007-01-02 13:51:58 UTC (rev 5218)
@@ -0,0 +1,5 @@
+version=3
+
+http://prdownload.berlios.de/kslovar/kslovar-(.*)\.tar\.bz2
+
+
More information about the pkg-kde-commits
mailing list