rev 18036 - in kde-extras/rekonq/trunk/debian: . patches
Felix Geyer
debfx-guest at alioth.debian.org
Thu May 20 19:58:11 UTC 2010
Author: debfx-guest
Date: 2010-05-20 19:58:10 +0000 (Thu, 20 May 2010)
New Revision: 18036
Added:
kde-extras/rekonq/trunk/debian/patches/
kde-extras/rekonq/trunk/debian/patches/01_disable_tests.diff
kde-extras/rekonq/trunk/debian/patches/series
kde-extras/rekonq/trunk/debian/rekonq.1.docbook
kde-extras/rekonq/trunk/debian/rekonq.postinst
kde-extras/rekonq/trunk/debian/rekonq.prerm
Modified:
kde-extras/rekonq/trunk/debian/changelog
kde-extras/rekonq/trunk/debian/control
kde-extras/rekonq/trunk/debian/copyright
Log:
Merge Ubuntu package.
Modified: kde-extras/rekonq/trunk/debian/changelog
===================================================================
--- kde-extras/rekonq/trunk/debian/changelog 2010-05-20 19:33:00 UTC (rev 18035)
+++ kde-extras/rekonq/trunk/debian/changelog 2010-05-20 19:58:10 UTC (rev 18036)
@@ -1,8 +1,133 @@
rekonq (0.4.0-1) UNRELEASED; urgency=low
- * Initial release. (Closes: #522396)
- * TODO : copyright
+ * Upload to Debian. (Closes: #522396)
- * Feel free to take over this package and its ITP (#522396)
+ -- Felix Geyer <debfx-pkg at fobos.de> Thu, 20 May 2010 12:28:59 +0200
- -- Xavier Vello <xavier.vello at gmail.com> Wed, 24 Mar 2010 15:02:25 +0100
+rekonq (0.4.0-0ubuntu2) maverick; urgency=low
+
+ * Add cmake to build-dependencies as kdelibs5-dev no longer depends on it.
+ * Register as x-www-browser alternative. (LP: #567211)
+ - Add debian/rekonq.postinst and debian/rekonq.prerm
+
+ -- Felix Geyer <debfx-pkg at fobos.de> Wed, 19 May 2010 00:49:10 +0200
+
+rekonq (0.4.0-0ubuntu1) lucid; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Fri, 12 Mar 2010 08:35:40 -0500
+
+rekonq (0.3.90-0ubuntu4) lucid; urgency=low
+
+ * Fixed debian/control again:
+ - rekonq depends on kdebase-bin, not konq-plugins...
+
+ -- Anthony Mercatante <tonio at ubuntu.com> Wed, 10 Mar 2010 23:58:12 +0100
+
+rekonq (0.3.90-0ubuntu3) lucid; urgency=low
+
+ * Fixed debian/control:
+ - Recommends konq-plugins
+
+ -- Anthony Mercatante <tonio at ubuntu.com> Wed, 10 Mar 2010 23:49:42 +0100
+
+rekonq (0.3.90-0ubuntu2) lucid; urgency=low
+
+ * Make the rekonq package provide www-browser (LP: #523141)
+ * Bump Standards-Version to 3.8.4
+ * Convert packaging to source format 3.0 (quilt), remove quilt build-dep,
+ quilt addon in debian/rules, and README.source
+ * Bump debhelper build-depend version to 7.3.16, and pkg-kde-tool to 0.5.0
+ for the above
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Sat, 27 Feb 2010 14:25:06 -0500
+
+rekonq (0.3.90-0ubuntu4) lucid; urgency=low
+
+ * Fixed debian/control again:
+ - rekonq depends on kdebase-bin, not konq-plugins...
+
+ -- Anthony Mercatante <tonio at ubuntu.com> Wed, 10 Mar 2010 23:58:12 +0100
+
+rekonq (0.3.90-0ubuntu3) lucid; urgency=low
+
+ * Fixed debian/control:
+ - Recommends konq-plugins
+
+ -- Anthony Mercatante <tonio at ubuntu.com> Wed, 10 Mar 2010 23:49:42 +0100
+
+rekonq (0.3.90-0ubuntu1) lucid; urgency=low
+
+ * New upstream release
+ * Drop kubuntu_01_polish_config_dialog.diff
+ * Renamed kubuntu_01_disable_tests.diff to
+ kubuntu_01_disable_tests.diff
+
+ -- Anthony Mercatante <tonio at ubuntu.com> Fri, 12 Feb 2010 16:42:44 -0500
+
+rekonq (0.3.0-0ubuntu3) lucid; urgency=low
+
+ * Add missing epoch to Qt build-depends version
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Wed, 25 Nov 2009 13:47:10 +0000
+
+rekonq (0.3.0-0ubuntu2) lucid; urgency=low
+
+ * Rebuild against Qt 4.6 rc 1, which is binary incompatible with 4.6
+ beta
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 24 Nov 2009 09:00:03 +0000
+
+rekonq (0.3.0-0ubuntu1) lucid; urgency=low
+
+ * New upstream release:
+ - Disable tests with kubuntu_02_disable_tests.diff. We have no interest
+ in these and they cause an FTBFS inside the chroot.
+ * Transition from kde.mk to dh --with-kde:
+ - debian/control: Remove cdbs build-dependency
+ - debian/rules: Build with the dh7 kde and quilt addons
+ * Add README.source for quilt
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Wed, 18 Nov 2009 12:29:25 -0500
+
+rekonq (0.2.90-0ubuntu1) lucid; urgency=low
+
+ * New upstream beta release
+ * Add kubuntu_01_polish_config_dialog.diff to polish up the config dialog.
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Tue, 03 Nov 2009 17:15:00 -0500
+
+rekonq (0.2.0-0ubuntu1) karmic; urgency=low
+
+ * New upstream release
+ * Bump Standards-Version to 3.8.3
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Fri, 21 Aug 2009 16:00:05 -0400
+
+rekonq (0.1.98-0ubuntu1) karmic; urgency=low
+
+ * New upstream release (LP: #413169)
+
+ -- Alessandro Ghersi <alessandro-ghersi at kubuntu.org> Thu, 13 Aug 2009 18:23:47 +0200
+
+rekonq (0.1.95-0ubuntu1) karmic; urgency=low
+
+ * New upstream release
+ * Bump Standards-Version to 3.8.2
+
+ -- Jonathan Thomas <echidnaman at kubuntu.org> Mon, 03 Aug 2009 12:39:22 -0400
+
+rekonq (0.1-0ubuntu2) karmic; urgency=low
+
+ * Fixed debian/copyright:
+ - Fixed authors list, as some copyrighted code is from Arora and
+ Arora authors shouldn't be mentionned as upstream
+
+ -- Anthony Mercatante <tonio at ubuntu.com> Tue, 02 Jun 2009 19:18:26 +0200
+
+rekonq (0.1-0ubuntu1) karmic; urgency=low
+
+ * Initial release
+
+ -- Anthony Mercatante <tonio at ubuntu.com> Mon, 2 May 2009 06:52:11 +0200
Modified: kde-extras/rekonq/trunk/debian/control
===================================================================
--- kde-extras/rekonq/trunk/debian/control 2010-05-20 19:33:00 UTC (rev 18035)
+++ kde-extras/rekonq/trunk/debian/control 2010-05-20 19:58:10 UTC (rev 18036)
@@ -4,20 +4,23 @@
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Build-Depends: debhelper (>= 7.3.16),
pkg-kde-tools (>= 0.5.0),
- kdelibs5-dev (>= 4:4.4.0)
+ cmake,
+ docbook2x,
+ kdelibs5-dev
Standards-Version: 3.8.4
Homepage: http://rekonq.sourceforge.net/
Package: rekonq
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A lightweight, WebKit based web browser for KDE
+Depends: ${shlibs:Depends}, ${misc:Depends}, kdebase-bin
+Provides: www-browser
+Description: KDE web browser based on Webkit
rekonq is a web browser based on WebKit and the KDE technologies.
Its aim is to integrate nicely in the KDE desktop while providing
a lightweight experience.
.
Non-exhaustive list of features :
- - shares bookmarks and network settings with konqueror
- - uses the kwallet password manager
- - integrates with the kget download manager
- - anonymous browsing mode
+ - shares bookmarks and network settings with konqueror
+ - uses the kwallet password manager
+ - integrates with the kget download manager
+ - anonymous browsing mode
Modified: kde-extras/rekonq/trunk/debian/copyright
===================================================================
--- kde-extras/rekonq/trunk/debian/copyright 2010-05-20 19:33:00 UTC (rev 18035)
+++ kde-extras/rekonq/trunk/debian/copyright 2010-05-20 19:58:10 UTC (rev 18036)
@@ -1 +1,35 @@
-TODO
+This package was debianized by Anthony Mercatante <tonio at ubuntu.com> on
+Fri, 22 May 2009 06:55:09 +0200.
+
+It was downloaded from http://rekonq.sourceforge.net
+
+Upstream authors:
+ Andrea Diamantini <adjam7 at gmail dot com>
+ Alexandr Domrachev <alexandr.domrachev at gmail dot com
+ Pawel Prazak <kojots350 at gmail dot com>
+
+Copyright:
+ Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
+ Copyright (C) 2008 Benjamin C. Meyer <ben at meyerhome.net>
+ Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+ Copyright (C) 2009 by Paweł Prażak <pawelprazak at gmail dot com>
+
+Licence:
+
+ 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-2'.
+
Added: kde-extras/rekonq/trunk/debian/patches/01_disable_tests.diff
===================================================================
--- kde-extras/rekonq/trunk/debian/patches/01_disable_tests.diff (rev 0)
+++ kde-extras/rekonq/trunk/debian/patches/01_disable_tests.diff 2010-05-20 19:58:10 UTC (rev 18036)
@@ -0,0 +1,13 @@
+Index: rekonq-0.3.90/src/CMakeLists.txt
+===================================================================
+--- rekonq-0.3.90.orig/src/CMakeLists.txt 2010-02-27 14:56:25.980811971 -0500
++++ rekonq-0.3.90/src/CMakeLists.txt 2010-02-27 14:56:32.081823537 -0500
+@@ -1,7 +1,7 @@
+ ### ------- sub dirs -------
+
+ ADD_SUBDIRECTORY( data )
+-ADD_SUBDIRECTORY( tests )
++#ADD_SUBDIRECTORY( tests )
+
+
+ ### ------- SETTING REKONQ FILES..
Added: kde-extras/rekonq/trunk/debian/patches/series
===================================================================
--- kde-extras/rekonq/trunk/debian/patches/series (rev 0)
+++ kde-extras/rekonq/trunk/debian/patches/series 2010-05-20 19:58:10 UTC (rev 18036)
@@ -0,0 +1 @@
+01_disable_tests.diff
Added: kde-extras/rekonq/trunk/debian/rekonq.1.docbook
===================================================================
--- kde-extras/rekonq/trunk/debian/rekonq.1.docbook (rev 0)
+++ kde-extras/rekonq/trunk/debian/rekonq.1.docbook 2010-05-20 19:58:10 UTC (rev 18036)
@@ -0,0 +1,115 @@
+<?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>Mercatante</firstname>
+ <surname>Anthony</surname>
+ <email>tonio at ubuntu.com</email>
+ </author>
+ <copyright>
+ <year>2009</year>
+ <holder>Anthony Mercatante</holder>
+ </copyright>
+ <!-- XXX IMPORTANT XXX -->
+ <!-- Keep this date up to date: -->
+ <date>2009-06-01</date>
+ <!-- ^^^^^^^^^^ -->
+ </refentryinfo>
+ <refmeta>
+ <refentrytitle>rekonq</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+ <refnamediv>
+ <refname>rekonq</refname>
+ <refpurpose>network interfaces monitor for KDE's systray</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>rekonq</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>
+ KDE web browser based on Webkit
+ </para>
+ <para>
+ Its code is based on Nokia QtDemoBrowser, just like Arora. Anyway its
+ implementation is going to embrace KDE technologies to have a full-featured
+ KDE web browser.
+ </para>
+ </refsect1>
+ <refsect1>
+ <title>OPTIONS</title>
+ <para>
+ All <productname>KDE</productname> and <productname>Qt</productname>
+ programs accept a some common command-line options. Password Manager 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 Anthony Mercatante
+ <email>tonio at ubuntu.com</email> for the
+ <productname>Debian</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/rekonq/trunk/debian/rekonq.postinst
===================================================================
--- kde-extras/rekonq/trunk/debian/rekonq.postinst (rev 0)
+++ kde-extras/rekonq/trunk/debian/rekonq.postinst 2010-05-20 19:58:10 UTC (rev 18036)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] ; then
+ update-alternatives --install /usr/bin/x-www-browser \
+ x-www-browser /usr/bin/rekonq 40
+fi
Added: kde-extras/rekonq/trunk/debian/rekonq.prerm
===================================================================
--- kde-extras/rekonq/trunk/debian/rekonq.prerm (rev 0)
+++ kde-extras/rekonq/trunk/debian/rekonq.prerm 2010-05-20 19:58:10 UTC (rev 18036)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+ update-alternatives --remove x-www-browser /usr/bin/rekonq
+fi
More information about the pkg-kde-commits
mailing list