rev 18398 - kde-extras/komparator/trunk/debian

Fri Jun 25 09:06:58 UTC 2010

Author: fabo
Date: 2010-06-25 09:06:51 +0000 (Fri, 25 Jun 2010)
New Revision: 18398

Added:
   kde-extras/komparator/trunk/debian/komparator.manpages
   kde-extras/komparator/trunk/debian/komparator4.1
Removed:
   kde-extras/komparator/trunk/debian/komparator.1
   kde-extras/komparator/trunk/debian/watch
Modified:
   kde-extras/komparator/trunk/debian/changelog
   kde-extras/komparator/trunk/debian/control
   kde-extras/komparator/trunk/debian/copyright
   kde-extras/komparator/trunk/debian/menu
Log:
Rewrite copyright file
Adjust manpage and menu files
Remove watch file


Modified: kde-extras/komparator/trunk/debian/changelog
===================================================================

--- kde-extras/komparator/trunk/debian/changelog	2010-06-23 07:54:59 UTC (rev 18397)
+++ kde-extras/komparator/trunk/debian/changelog	2010-06-25 09:06:51 UTC (rev 18398)
@@ -1,12 +1,13 @@
-komparator (1:0.3-1) UNRELEASED; urgency=low
+komparator (1:0.3-1) unstable; urgency=low
 
-  * New upstream release - KDE 4 port
+  * New upstream release - KDE 4 port (Closes: #555056, #586829)
     - add epoch to version number
   * Switch to dpkg-source 3.0 (quilt) format
   * Update debian/control:
     - update build dependencies for KDE 4 port
     - bump Standards-Version to 3.8.4
     - update Homepage
+  * Rewrite debian/copyright from scratch.
   * Update debian/rules: switch to dh usage.
 
  -- Fathi Boudra <fabo at debian.org>  Wed, 23 Jun 2010 09:50:13 +0300

Modified: kde-extras/komparator/trunk/debian/control
===================================================================
--- kde-extras/komparator/trunk/debian/control	2010-06-23 07:54:59 UTC (rev 18397)
+++ kde-extras/komparator/trunk/debian/control	2010-06-25 09:06:51 UTC (rev 18398)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 7.4.15), cmake, kdelibs5-dev
+Build-Depends: debhelper (>= 7.4.15), cmake, gettext,
+ kdelibs5-dev (>= 4:4.4.4), pkg-kde-tools (>= 0.6.5)
 Standards-Version: 3.8.4
 Homepage: http://kde-apps.org/content/show.php?content=116039
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/komparator/trunk

Modified: kde-extras/komparator/trunk/debian/copyright
===================================================================
--- kde-extras/komparator/trunk/debian/copyright	2010-06-23 07:54:59 UTC (rev 18397)
+++ kde-extras/komparator/trunk/debian/copyright	2010-06-25 09:06:51 UTC (rev 18398)
@@ -1,62 +1,113 @@
-This package was debianized by Fathi Boudra <fboudra at free.fr> on
-Tue,  1 Aug 2006 17:42:25 +0200.
+This work was packaged for Debian by:
 
-It was downloaded from http://komparator.sourceforge.net
+    Fathi Boudra <fboudra at free.fr> on Tue, 1 Aug 2006 17:42:25 +0200.
 
-Upstream Author: Georg Hennig <georg.hennig at web.de>
+It was downloaded from:
 
-Copyright: © 2005-2007 Georg Hennig <georg.hennig at web.de>
+    http://kde-apps.org/content/show.php/komparator4?content=116039
 
-Copyright for fdupes: © 1999 Adrian Lopez <adrian2 at caribe.net>
+Upstream Author:
 
-fdupes license:
+    Georg Hennig <georg.hennig at web.de>
 
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation files
-(the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Copyright:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+    Copyright (C) 2005-2010 Georg Hennig <georg.hennig at web.de>
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+License:
 
-Komparator uses the compare function from fdupes, version 1.40, in a modified
-way. It uses also kquery.cpp, kquery.h, kdatecombo.cpp and kdatecombo.h taken
-without changes from kfind which is © Stephan Kulow <coolo at kde.org> and
-is licensed under the GPL, see below.
+    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.
 
-komparator license:
+    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.
 
-   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.
+    You should have received a copy of the GNU General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>
 
-   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.
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-   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
+The Debian packaging is:
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+    Copyright (C) 2006-2010 Fathi Boudra <fabo at debian.org>
 
-The Debian packaging is © 2006, Fathi Boudra <fboudra at free.fr> and
-is licensed under the GPL, see above.
+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.
 
+Copyright for src/komparatorcomparejob.*:
+
+    Copyright (C) 2005-2010 Georg Hennig <georg.hennig at web.de>
+
+    This file uses main parts of "fdupes.c" from fdupes-1.40.
+    FDUPES Copyright (C) 1999 Adrian Lopez <adrian2 at caribe.net>
+
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation files
+    (the "Software"), to deal in the Software without restriction,
+    including without limitation the rights to use, copy, modify, merge,
+    publish, distribute, sublicense, and/or sell copies of the Software,
+    and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
+
+Copyright for src/kmdcodec.*:
+
+    Copyright (C) 2000-2001 Dawit Alemayehu <adawit at kde.org>
+    Copyright (C) 2001 Rik Hemsley (rikkus) <rik at kde.org>
+
+    This program 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 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+    RFC 1321 "MD5 Message-Digest Algorithm" Copyright (C) 1991-1992.
+    RSA Data Security, Inc. Created 1991. All rights reserved.
+
+    The KMD5 class is based on a C++ implementation of
+    "RSA Data Security, Inc. MD5 Message-Digest Algorithm" by
+    Mordechai T. Abzug,  Copyright (c) 1995.  This implementation
+    passes the test-suite as defined in RFC 1321.
+
+    The encoding and decoding utilities in KCodecs with the exception of
+    quoted-printable are based on the java implementation in HTTPClient
+    package by Ronald Tschal�r Copyright (C) 1996-1999.
+
+    The quoted-printable codec as described in RFC 2045, section 6.7. is by
+    Rik Hemsley (C) 2001.
+
+    KMD4 class based on the LGPL code of Copyright (C) 2001 Nikos Mavroyanopoulos
+    The algorithm is due to Ron Rivest.  This code is based on code
+    written by Colin Plumb in 1993.
+
+Copyright for src/kdatecombo.*:
+
+    Copyright (C) 2008 Daniel Caleb Jones <danielcjones at gmail.com> 
+
 The documentations provided with komparator is distributed under
 the GNU Free Documentation License (FDL). They are considered free with
 regards to the Debian Free Software Guidelines (DFSG) because they don't
@@ -64,3 +115,7 @@
 
 On Debian systems, the complete text of the GNU Free Documentation
 License can be found in `/usr/share/common-licenses/GFDL'.
+
+Komparator uses kquery.cpp, kquery.h, kdatecombo.cpp and kdatecombo.h taken
+without changes from kfind which is © Stephan Kulow <coolo at kde.org> and
+is licensed under the GPL, see above.

Added: kde-extras/komparator/trunk/debian/komparator.manpages
===================================================================
--- kde-extras/komparator/trunk/debian/komparator.manpages	                        (rev 0)
+++ kde-extras/komparator/trunk/debian/komparator.manpages	2010-06-25 09:06:51 UTC (rev 18398)
@@ -0,0 +1 @@
+debian/komparator4.1

Added: kde-extras/komparator/trunk/debian/komparator4.1
===================================================================
--- kde-extras/komparator/trunk/debian/komparator4.1	                        (rev 0)
+++ kde-extras/komparator/trunk/debian/komparator4.1	2010-06-25 09:06:51 UTC (rev 18398)
@@ -0,0 +1,17 @@
+.TH komparator4 1 "MAY 2007" Linux "Komparator4 Manual"
+.SH NAME
+komparator4 \- searches and synchronizes two directories.
+.SH SYNOPSIS
+.B komparator4
+.I url1
+.I url2
+.SH DESCRIPTION
+.B komparator4
+is an application that searches and synchronizes two directories. It discovers duplicate, newer or missing files and empty folders. It works on local and network or kioslave protocol folders.
+.SH OPTIONS
+.IP url1
+It is the first path to the desired directory, that corresponds to the left URL.
+.IP url2
+It is the second path to another desired directory, that corresponds to the right URL.
+.SH AUTHOR
+Daniel Martins <danfmartins at gmail.com>

Modified: kde-extras/komparator/trunk/debian/menu
===================================================================
--- kde-extras/komparator/trunk/debian/menu	2010-06-23 07:54:59 UTC (rev 18397)
+++ kde-extras/komparator/trunk/debian/menu	2010-06-25 09:06:51 UTC (rev 18398)
@@ -1,5 +1,5 @@
 ?package(komparator):\
     needs="X11" \
     section="Applications/File Management" \
-    title="komparator" \
-    command="/usr/bin/komparator"
+    title="Komparator4" \
+    command="/usr/bin/komparator4"


