rev 3456 - in kde-extras/krecipes: tags/0.9.1-1/debian trunk/debian

Julien Louis ptitlouis-guest at costa.debian.org
Sun Apr 2 11:11:59 UTC 2006


Author: ptitlouis-guest
Date: 2006-04-02 11:11:57 +0000 (Sun, 02 Apr 2006)
New Revision: 3456

Removed:
   kde-extras/krecipes/tags/0.9.1-1/debian/dirs
   kde-extras/krecipes/tags/0.9.1-1/debian/docs
   kde-extras/krecipes/trunk/debian/dirs
   kde-extras/krecipes/trunk/debian/docs
Modified:
   kde-extras/krecipes/tags/0.9.1-1/debian/control
   kde-extras/krecipes/tags/0.9.1-1/debian/copyright
   kde-extras/krecipes/tags/0.9.1-1/debian/rules
   kde-extras/krecipes/trunk/debian/control
   kde-extras/krecipes/trunk/debian/copyright
   kde-extras/krecipes/trunk/debian/rules
Log:
 * debian/control:
   - Add krecipes-doc to krecipes Suggests
   - s/independent architecture/architecture independent/ in krecipes-data
	  description
 * Improve debian/copyright
 * remove unneeded dirs and docs files
 * remove inclusion of already included makfiles in debian/rules


Modified: kde-extras/krecipes/tags/0.9.1-1/debian/control
===================================================================
--- kde-extras/krecipes/tags/0.9.1-1/debian/control	2006-04-01 20:14:42 UTC (rev 3455)
+++ kde-extras/krecipes/tags/0.9.1-1/debian/control	2006-04-02 11:11:57 UTC (rev 3456)
@@ -8,8 +8,8 @@
 Package: krecipes
 Architecture: any
 Depends: krecipes-data (= ${Source-Version}), ${shlibs:Depends}
-Suggests: libqt3-mt-mysql | libqt3-mt-psql
-Description: KDE recipes manager
+Suggests: libqt3-mt-mysql | libqt3-mt-psql, krecipes-doc (= ${Source-Version})
+Description: recipes manager for KDE
  Krecipes is a KDE application designed to managed recipes. It can help you to
  do your shopping list, search through your recipes to find what you can do
  with available ingredients and a diet helper. It can also import or export
@@ -19,7 +19,7 @@
 Package: krecipes-doc
 Architecture: all
 Recommends: krecipes (= ${Source-Version})
-Description: KDE recipes manager documentation
+Description: recipes manager for KDE - documentation
  Krecipes is a KDE application designed to managed recipes. It can help you to
  do your shopping list, search through your recipes to find what you can do
  with available ingredients and a diet helper. It can also import or export
@@ -30,12 +30,11 @@
 
 Package: krecipes-data
 Architecture: all
-Description: KDE recipes manager - data files
+Description: recipes manager for KDE - data files
  Krecipes is a KDE application designed to managed recipes. It can help you to
  do your shopping list, search through your recipes to find what you can do
  with available ingredients and a diet helper. It can also import or export
  recipes from files in various format (eg RecipeML or Meal-Master) or from
  databases.
  .
- This package provides independent architecture files for the KDE recipes
- manager.
+ This package provides architecture independent files for krecipes.

Modified: kde-extras/krecipes/tags/0.9.1-1/debian/copyright
===================================================================
--- kde-extras/krecipes/tags/0.9.1-1/debian/copyright	2006-04-01 20:14:42 UTC (rev 3455)
+++ kde-extras/krecipes/tags/0.9.1-1/debian/copyright	2006-04-02 11:11:57 UTC (rev 3456)
@@ -23,7 +23,84 @@
    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'.
 
+other licenses:
+ - LGPL v2 or higher
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+	 MA 02110-1301, USA.
+
+  On Debian GNU/Linux systems, the complete text of the GNU Library General
+  Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+
+The following files are licensed under LGPL:
+ - krecipes/src/krelayout.{h,cpp}
+ - krecipes/src/kreunit.{h,cpp}
+ - krecipes/src/dialogs/krepagelayoutdia.{h,cpp}
+ - kreruler.{h,cpp}
+
+
+Copyright notices:
+ - krecipes/src/kreunit.h:
+    Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie at kde.org>,
+    Torben Weis <weis at kde.org>
+ - krecipes/src/importers/mx2importer.{h,cpp}
+   krecipes/src/importers/recipemlimporter.{h,cpp}:
+    Copyright (C) 2003 Richard Lärkäng
+    Copyright (C) 2003 Jason Kivlighn
+ - krecipes/src/widgets/dragarea.cpp sizehandle.{h,cpp}:
+	 Copyright (C) 2000 Trolltech AS.  All rights reserved.
+    2003 by Jason Kivlighn <mizunoami44 at users.sourceforge.net>
+ - krecipes/src/widgets/ratingwidget.{h,cpp}:
+    (C) 2003-2005 by Robby Stephenson <robby at periapsis.org>
+ - krecipes/src/widgets/kreruler.{h,cpp}:
+    Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie at kde.org>
+    Copyright (C) 2005 Jason Kivlighn <jkivlighn at gmail.com>
+ - krecipes/src/widgets/kdateedit.cpp:
+    Copyright (c) 2002 Cornelius Schumacher <schumacher at kde.org>
+    Copyright (c) 2003-2004 Reinhold Kainhofer <reinhold at kainhofer.com>
+    Copyright (c) 2004 Tobias Koenig <tokoe at kde.org>
+ - krecipes/src/widgets/kdateedit.h:
+    Copyright (c) 2002 Cornelius Schumacher <schumacher at kde.org>
+    Copyright (c) 2004 Tobias Koenig <tokoe at kde.org>
+ - krecipes/src/widgets/kdatepickerpopup.cpp
+   krecipes/src/widgets/kdatepickerpopup.h:
+    Copyright (c) 2004 Bram Schoenmakers <bramschoenmakers at kde.nl>
+ - krecipes:src/widgets/kwidgetlistbox.{h,cpp}:
+    Copyright (C) 2005 Petri Damstén <petri.damsten at iki.fi>
+ - krecipes/src/backends/SQLite/libqsqlite/
+    Copyright (C) 2003 by Unai Garro (ugarro at users.sourceforge.net)
+    Martin Imobersteg <imm at gmx.ch> and opie project
+ - krecipes/src/widgets/kwidgetlistbox.{h,cpp}:
+    Copyright (C) 2005 Petri Damstén <petri.damsten at iki.fi>
+
+
+Derived works:
+ - krecipes/src/kstartuplogo.h:
+    based from kstartuplogo from Umbrello http://uml.sourceforge.net
+ - krecipes/src/widgets/kdateedit.cpp krecipes/src/widgets/kdateedit.h
+   krecipes/src/widgets/kdatepickerpopup.cpp krecipes/src/widgets/kdatepickerpopup.h:
+    Those files are part of the libkdepim project and are licensed under the GNU
+    Library General Public License
+ - krecipes/src/widgets/kwidgetlistbox.{h,cpp}:
+    This file is a modified version from the original taken from the superkaramba
+    project
+ - krecipes/src/backends/SQLite/libqsqlite/
+   Copyright (C) 2003 by Unai Garro (ugarro at users.sourceforge.net)
+   Martin Imobersteg <imm at gmx.ch> and opie project

Deleted: kde-extras/krecipes/tags/0.9.1-1/debian/dirs

Deleted: kde-extras/krecipes/tags/0.9.1-1/debian/docs

Modified: kde-extras/krecipes/tags/0.9.1-1/debian/rules
===================================================================
--- kde-extras/krecipes/tags/0.9.1-1/debian/rules	2006-04-01 20:14:42 UTC (rev 3455)
+++ kde-extras/krecipes/tags/0.9.1-1/debian/rules	2006-04-02 11:11:57 UTC (rev 3456)
@@ -6,7 +6,7 @@
 
 # Add here any variable or target overrides you need
 
+DEB_INSTALL_DOCS_krecipes = README TODO
+
 include /usr/share/cdbs/1/class/kde.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk

Modified: kde-extras/krecipes/trunk/debian/control
===================================================================
--- kde-extras/krecipes/trunk/debian/control	2006-04-01 20:14:42 UTC (rev 3455)
+++ kde-extras/krecipes/trunk/debian/control	2006-04-02 11:11:57 UTC (rev 3456)
@@ -8,8 +8,8 @@
 Package: krecipes
 Architecture: any
 Depends: krecipes-data (= ${Source-Version}), ${shlibs:Depends}
-Suggests: libqt3-mt-mysql | libqt3-mt-psql
-Description: KDE recipes manager
+Suggests: libqt3-mt-mysql | libqt3-mt-psql, krecipes-doc (= ${Source-Version})
+Description: recipes manager for KDE
  Krecipes is a KDE application designed to managed recipes. It can help you to
  do your shopping list, search through your recipes to find what you can do
  with available ingredients and a diet helper. It can also import or export
@@ -19,7 +19,7 @@
 Package: krecipes-doc
 Architecture: all
 Recommends: krecipes (= ${Source-Version})
-Description: KDE recipes manager documentation
+Description: recipes manager for KDE - documentation
  Krecipes is a KDE application designed to managed recipes. It can help you to
  do your shopping list, search through your recipes to find what you can do
  with available ingredients and a diet helper. It can also import or export
@@ -30,12 +30,11 @@
 
 Package: krecipes-data
 Architecture: all
-Description: KDE recipes manager - data files
+Description: recipes manager for KDE - data files
  Krecipes is a KDE application designed to managed recipes. It can help you to
  do your shopping list, search through your recipes to find what you can do
  with available ingredients and a diet helper. It can also import or export
  recipes from files in various format (eg RecipeML or Meal-Master) or from
  databases.
  .
- This package provides independent architecture files for the KDE recipes
- manager.
+ This package provides architecture independent files for krecipes.

Modified: kde-extras/krecipes/trunk/debian/copyright
===================================================================
--- kde-extras/krecipes/trunk/debian/copyright	2006-04-01 20:14:42 UTC (rev 3455)
+++ kde-extras/krecipes/trunk/debian/copyright	2006-04-02 11:11:57 UTC (rev 3456)
@@ -23,7 +23,84 @@
    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'.
 
+other licenses:
+ - LGPL v2 or higher
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+	 MA 02110-1301, USA.
+
+  On Debian GNU/Linux systems, the complete text of the GNU Library General
+  Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+
+The following files are licensed under LGPL:
+ - krecipes/src/krelayout.{h,cpp}
+ - krecipes/src/kreunit.{h,cpp}
+ - krecipes/src/dialogs/krepagelayoutdia.{h,cpp}
+ - kreruler.{h,cpp}
+
+
+Copyright notices:
+ - krecipes/src/kreunit.h:
+    Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie at kde.org>,
+    Torben Weis <weis at kde.org>
+ - krecipes/src/importers/mx2importer.{h,cpp}
+   krecipes/src/importers/recipemlimporter.{h,cpp}:
+    Copyright (C) 2003 Richard Lärkäng
+    Copyright (C) 2003 Jason Kivlighn
+ - krecipes/src/widgets/dragarea.cpp sizehandle.{h,cpp}:
+	 Copyright (C) 2000 Trolltech AS.  All rights reserved.
+    2003 by Jason Kivlighn <mizunoami44 at users.sourceforge.net>
+ - krecipes/src/widgets/ratingwidget.{h,cpp}:
+    (C) 2003-2005 by Robby Stephenson <robby at periapsis.org>
+ - krecipes/src/widgets/kreruler.{h,cpp}:
+    Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie at kde.org>
+    Copyright (C) 2005 Jason Kivlighn <jkivlighn at gmail.com>
+ - krecipes/src/widgets/kdateedit.cpp:
+    Copyright (c) 2002 Cornelius Schumacher <schumacher at kde.org>
+    Copyright (c) 2003-2004 Reinhold Kainhofer <reinhold at kainhofer.com>
+    Copyright (c) 2004 Tobias Koenig <tokoe at kde.org>
+ - krecipes/src/widgets/kdateedit.h:
+    Copyright (c) 2002 Cornelius Schumacher <schumacher at kde.org>
+    Copyright (c) 2004 Tobias Koenig <tokoe at kde.org>
+ - krecipes/src/widgets/kdatepickerpopup.cpp
+   krecipes/src/widgets/kdatepickerpopup.h:
+    Copyright (c) 2004 Bram Schoenmakers <bramschoenmakers at kde.nl>
+ - krecipes:src/widgets/kwidgetlistbox.{h,cpp}:
+    Copyright (C) 2005 Petri Damstén <petri.damsten at iki.fi>
+ - krecipes/src/backends/SQLite/libqsqlite/
+    Copyright (C) 2003 by Unai Garro (ugarro at users.sourceforge.net)
+    Martin Imobersteg <imm at gmx.ch> and opie project
+ - krecipes/src/widgets/kwidgetlistbox.{h,cpp}:
+    Copyright (C) 2005 Petri Damstén <petri.damsten at iki.fi>
+
+
+Derived works:
+ - krecipes/src/kstartuplogo.h:
+    based from kstartuplogo from Umbrello http://uml.sourceforge.net
+ - krecipes/src/widgets/kdateedit.cpp krecipes/src/widgets/kdateedit.h
+   krecipes/src/widgets/kdatepickerpopup.cpp krecipes/src/widgets/kdatepickerpopup.h:
+    Those files are part of the libkdepim project and are licensed under the GNU
+    Library General Public License
+ - krecipes/src/widgets/kwidgetlistbox.{h,cpp}:
+    This file is a modified version from the original taken from the superkaramba
+    project
+ - krecipes/src/backends/SQLite/libqsqlite/
+   Copyright (C) 2003 by Unai Garro (ugarro at users.sourceforge.net)
+   Martin Imobersteg <imm at gmx.ch> and opie project

Deleted: kde-extras/krecipes/trunk/debian/dirs

Deleted: kde-extras/krecipes/trunk/debian/docs

Modified: kde-extras/krecipes/trunk/debian/rules
===================================================================
--- kde-extras/krecipes/trunk/debian/rules	2006-04-01 20:14:42 UTC (rev 3455)
+++ kde-extras/krecipes/trunk/debian/rules	2006-04-02 11:11:57 UTC (rev 3456)
@@ -6,7 +6,7 @@
 
 # Add here any variable or target overrides you need
 
+DEB_INSTALL_DOCS_krecipes = README TODO
+
 include /usr/share/cdbs/1/class/kde.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk




More information about the pkg-kde-commits mailing list