rev 14886 - kde-extras/krecipes/trunk/debian
Matthias Julius
mjulius-guest at alioth.debian.org
Sat Jun 6 04:48:33 UTC 2009
Author: mjulius-guest
Date: 2009-06-06 04:48:32 +0000 (Sat, 06 Jun 2009)
New Revision: 14886
Added:
kde-extras/krecipes/trunk/debian/README.source
kde-extras/krecipes/trunk/debian/krecipes-data.manpages
kde-extras/krecipes/trunk/debian/krecipes.1
kde-extras/krecipes/trunk/debian/krecipes.lintian-overrides
kde-extras/krecipes/trunk/debian/watch
Modified:
kde-extras/krecipes/trunk/debian/
kde-extras/krecipes/trunk/debian/changelog
kde-extras/krecipes/trunk/debian/compat
kde-extras/krecipes/trunk/debian/control
kde-extras/krecipes/trunk/debian/copyright
kde-extras/krecipes/trunk/debian/krecipes-data.install
kde-extras/krecipes/trunk/debian/krecipes.install
kde-extras/krecipes/trunk/debian/krecipes.menu
kde-extras/krecipes/trunk/debian/rules
Log:
Importing changes for 1.0~beta2-1
* New upstream release (Closes: #531675)
- Fix crash at startup when using sqlite (Closes: #478030)
- Added categories to .desktop file (Closes: #473367)
* Moved the .desktop file to /usr/share/applications in krecipes binary
package
* debian/control:
- Set myself as Uploader (Closes: #513860)
- Build-Depend on debhelper >=7
- Standards-Version 3.8.1
- Added ${misc:Depends} to all binary packages
- Added Build-Depends on autotools-dev
- Added chrpath to Build-Depends
- Added Homepage to source package
- Added Vcs-Browser and Vcs-Svn
- Moved packages from section kde to misc
* Set compat level to 7
* Rewrote debian/copyright
* Added debian/watch
* Added man page for krecipes
* Added lintian override for missing menu icon in krecipes, the icon is in
krecipes-data
* Added lintian override for missing man page because man page is in
krecipes-data
* krecipes' menu entry to Applications/Data Management
* Strip rpath from krecipes binary
* Added debian/README.source
Property changes on: kde-extras/krecipes/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: kde-extras/krecipes/trunk/debian/README.source
===================================================================
--- kde-extras/krecipes/trunk/debian/README.source (rev 0)
+++ kde-extras/krecipes/trunk/debian/README.source 2009-06-06 04:48:32 UTC (rev 14886)
@@ -0,0 +1,5 @@
+This package uses CDBS as build system. See /usr/share/doc/cdbs/cdbs-doc.{html|pdf.gz}.
+
+This package uses quilt for patch management. See /usr/share/doc/quilt/README.gz.
+
+ -- Matthias Julius <mdeb at julius-net.net>, Fri, 27 Mar 2009 15:32:58 -0400
Modified: kde-extras/krecipes/trunk/debian/changelog
===================================================================
--- kde-extras/krecipes/trunk/debian/changelog 2009-06-06 03:26:38 UTC (rev 14885)
+++ kde-extras/krecipes/trunk/debian/changelog 2009-06-06 04:48:32 UTC (rev 14886)
@@ -1,3 +1,41 @@
+krecipes (1.0~beta2-1) unstable; urgency=low
+
+ * New upstream release (Closes: #531675)
+ - Fix crash at startup when using sqlite (Closes: #478030)
+ - Added categories to .desktop file (Closes: #473367)
+ * Moved the .desktop file to /usr/share/applications in krecipes binary
+ package
+ * debian/control:
+ - Set myself as Uploader (Closes: #513860)
+ - Build-Depend on debhelper >=7
+ - Standards-Version 3.8.1
+ - Added ${misc:Depends} to all binary packages
+ - Added Build-Depends on autotools-dev
+ - Added chrpath to Build-Depends
+ - Added Homepage to source package
+ - Added Vcs-Browser and Vcs-Svn
+ - Moved packages from section kde to misc
+ * Set compat level to 7
+ * Rewrote debian/copyright
+ * Added debian/watch
+ * Added man page for krecipes
+ * Added lintian override for missing menu icon in krecipes, the icon is in
+ krecipes-data
+ * Added lintian override for missing man page because man page is in
+ krecipes-data
+ * krecipes' menu entry to Applications/Data Management
+ * Strip rpath from krecipes binary
+ * Added debian/README.source
+
+ -- Matthias Julius <mdeb at julius-net.net> Sat, 06 Jun 2009 00:18:25 -0400
+
+krecipes (1.0~beta1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix gcc-4.3 FTBFS, patch by KiBi (Closes: #455318)
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Sun, 16 Mar 2008 18:14:00 +0100
+
krecipes (1.0~beta1-1) unstable; urgency=low
* New upstream release
Modified: kde-extras/krecipes/trunk/debian/compat
===================================================================
--- kde-extras/krecipes/trunk/debian/compat 2009-06-06 03:26:38 UTC (rev 14885)
+++ kde-extras/krecipes/trunk/debian/compat 2009-06-06 04:48:32 UTC (rev 14886)
@@ -1 +1 @@
-5
+7
Modified: kde-extras/krecipes/trunk/debian/control
===================================================================
--- kde-extras/krecipes/trunk/debian/control 2009-06-06 03:26:38 UTC (rev 14885)
+++ kde-extras/krecipes/trunk/debian/control 2009-06-06 04:48:32 UTC (rev 14886)
@@ -1,14 +1,17 @@
Source: krecipes
-Section: kde
+Section: misc
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Julien Louis <ptitlouis at sysif.net>
-Build-Depends: cdbs, debhelper (>= 5), kdelibs4-dev, libsqlite3-dev, libmysqlclient15-dev, libpq-dev
-Standards-Version: 3.7.2
+Uploaders: Matthias Julius <mdeb at julius-net.net>
+Build-Depends: cdbs, debhelper (>= 7), autotools-dev, chrpath, kdelibs4-dev, libsqlite3-dev, libmysqlclient15-dev, libpq-dev
+Standards-Version: 3.8.1
+Homepage: http://krecipes.sourceforge.net/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-kde/kde-extras/krecipes/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/kde-extras/krecipes/trunk
Package: krecipes
Architecture: any
-Depends: krecipes-data (= ${source:Version}), ${shlibs:Depends}
+Depends: krecipes-data (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libqt3-mt-mysql | libqt3-mt-psql, krecipes-doc (= ${source:Version})
Description: recipes manager for KDE
Krecipes is a KDE application designed to manage recipes. It can help you to
@@ -20,6 +23,7 @@
Package: krecipes-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Recommends: krecipes (>= ${binary:Version})
Description: recipes manager for KDE - documentation
Krecipes is a KDE application designed to manage recipes. It can help you to
@@ -28,10 +32,11 @@
recipes from files in various format (eg. RecipeML or Meal-Master) or from
databases.
.
- This package contains the krecipes documentation
+ This package contains the krecipes documentation.
Package: krecipes-data
Architecture: all
+Depends: ${misc:Depends}
Description: recipes manager for KDE - data files
Krecipes is a KDE application designed to manage recipes. It can help you to
do your shopping list, search through your recipes to find what you can do
Modified: kde-extras/krecipes/trunk/debian/copyright
===================================================================
--- kde-extras/krecipes/trunk/debian/copyright 2009-06-06 03:26:38 UTC (rev 14885)
+++ kde-extras/krecipes/trunk/debian/copyright 2009-06-06 04:48:32 UTC (rev 14886)
@@ -1,113 +1,459 @@
-This package was debianized by Julien Louis <ptitlouis at sysif.net> on
-Fri, 17 Mar 2006 23:43:12 +0100.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/?rev=48&sc=1
+Upstream-Name: Krecipes
+Upstream-Maintainer: Jason Kivlighn <jkivlighn at gmail.com>
+ Unai Garro <ugarro at users.sourceforge.net>
+ Cyril Bosselut <bosselut at b1project.com>
+Upstream-Source: http://krecipes.sourceforge.net/
-It was downloaded from http://krecipes.sourceforge.net/
+Files: *
+Copyright: © 2003-2005 Unai Garro <ugarro at users.sourceforge.net>
+ © 2003-2005 Cyril Bosselut <bosselut at b1project.com>
+ © 2003-2006 Jason Kivlighn <jkivlighn at gmail.com>
+ © 2003 Martin Imobersteg <imm at gmx.ch>
+ © 2003 opie project
+ © 2003 Richard Lärkäng
+ © 2005 Petri Damstén <petri.damsten at iki.fi
+License: GPL-2+
-Copyright Holders:
-Unai Garro 2003-2006 <ugarro at users.sourceforge.net>
-Jason Kivlighn 2003-2006 <mizunoami44 at users.sourceforge.net>
-Cyril Bosselut 2003-2006 <bosselut at b1project.com>
+Files: doc/*
+Copyright: © 2004-2006 Colleen Beamer
+Copyright: © 2004-2006 Jason Kivlighn
+License: GFDL-1.1+-NIV
-License:
+Files: krecipes/src/widgets/ratingwidget.*
+Copyright: © 2003-2005 by Robby Stephenson <robby at periapsis.org>
+License: GPL-2
- 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.
+Files: krecipes/src/widgets/kdateedit.*
+Copyright: © 2003 Cornelius Schumacher <schumacher at kde.org>
+ © 2003-2004 Reinhold Kainhofer <reinhold at kainhofer.com>
+ © 2004 Tobias Koenig <tokoe at kde.org>
+License: LGPL-2+
- 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.
+Files: krecipes/src/widgets/kdatepickerpopup.*
+Copyright: © 2004 Bram Schoenmakers <bramschoenmakers at kde.nl>
+License: LGPL-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
+Files: krecipes/src/widgets/kreruler.*
+Copyright: © 1998-1999 Reginald Stadlbauer <reggie at kde.org>
+ © 2005 Jason Kivlighn <jkivlighn at gmail.com>
+License: LGPL-2+
+
+Files: krecipes/src/krepagelayout.*
+Copyright: © 1998-1999 Torben Weis <weis at kde.org>
+ © 2002-2003 David Faure <faure at kde.org>
+ © 2003 Nicolas GOUTTE <goutte at kde.org>
+ © 2005 Jason Kivlighn <jkivlighn at gmail.com>
+License: LGPL-2+
+
+Files: debian/*
+Copyright: © 2006 Julien Louis <ptitlouis at sysif.net>
+ © 2009 Matthias Julius <mdeb at julius-net.net>
+License: GPL-2+
+
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of version 2 of the GNU General Public License as
+ published by the Free Software Foundation;
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+License: GPL-2+
+ 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.
-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 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 version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2+
+ 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.
+ 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.
+ 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'.
+ On Debian GNU/Linux systems, the complete text of the GNU Library General
+ Public License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
+License: GFDL-1.1+-NIV
+ Permission is granted to copy, distribute and/or modify this document under the
+ terms of the GNU Free Documentation License, Version 1.1 or any later version
+ published by the Free Software Foundation; with no Invariant Sections, with no
+ Front-Cover Texts, and with no Back-Cover Texts.
-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}
+ GNU Free Documentation License
+ Version 1.1, March 2000
+ Copyright (C) 2000 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
-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>
+ 0. PREAMBLE
-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
+ The purpose of this License is to make a manual, textbook, or other
+ written document "free" in the sense of freedom: to assure everyone
+ the effective freedom to copy and redistribute it, with or without
+ modifying it, either commercially or noncommercially. Secondarily,
+ this License preserves for the author and publisher a way to get
+ credit for their work, while not being considered responsible for
+ modifications made by others.
+ This License is a kind of "copyleft", which means that derivative
+ works of the document must themselves be free in the same sense. It
+ complements the GNU General Public License, which is a copyleft
+ license designed for free software.
-The documentation is under the GFDL licence with the following copyright notice:
- Permission is granted to copy, distribute and/or modify this document under the
- terms of the GNU Free Documentation License, Version 1.1 or any later version
- published by the Free Software Foundation; with no Invariant Sections, with no
- Front-Cover Texts, and with no Back-Cover Texts.
+ We have designed this License in order to use it for manuals for free
+ software, because free software needs free documentation: a free
+ program should come with manuals providing the same freedoms that the
+ software does. But this License is not limited to software manuals;
+ it can be used for any textual work, regardless of subject matter or
+ whether it is published as a printed book. We recommend this License
+ principally for works whose purpose is instruction or reference.
+
+
+ 1. APPLICABILITY AND DEFINITIONS
+
+ This License applies to any manual or other work that contains a
+ notice placed by the copyright holder saying it can be distributed
+ under the terms of this License. The "Document", below, refers to any
+ such manual or work. Any member of the public is a licensee, and is
+ addressed as "you".
+
+ A "Modified Version" of the Document means any work containing the
+ Document or a portion of it, either copied verbatim, or with
+ modifications and/or translated into another language.
+
+ A "Secondary Section" is a named appendix or a front-matter section of
+ the Document that deals exclusively with the relationship of the
+ publishers or authors of the Document to the Document's overall subject
+ (or to related matters) and contains nothing that could fall directly
+ within that overall subject. (For example, if the Document is in part a
+ textbook of mathematics, a Secondary Section may not explain any
+ mathematics.) The relationship could be a matter of historical
+ connection with the subject or with related matters, or of legal,
+ commercial, philosophical, ethical or political position regarding
+ them.
+
+ The "Invariant Sections" are certain Secondary Sections whose titles
+ are designated, as being those of Invariant Sections, in the notice
+ that says that the Document is released under this License.
+
+ The "Cover Texts" are certain short passages of text that are listed,
+ as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+ the Document is released under this License.
+
+ A "Transparent" copy of the Document means a machine-readable copy,
+ represented in a format whose specification is available to the
+ general public, whose contents can be viewed and edited directly and
+ straightforwardly with generic text editors or (for images composed of
+ pixels) generic paint programs or (for drawings) some widely available
+ drawing editor, and that is suitable for input to text formatters or
+ for automatic translation to a variety of formats suitable for input
+ to text formatters. A copy made in an otherwise Transparent file
+ format whose markup has been designed to thwart or discourage
+ subsequent modification by readers is not Transparent. A copy that is
+ not "Transparent" is called "Opaque".
+
+ Examples of suitable formats for Transparent copies include plain
+ ASCII without markup, Texinfo input format, LaTeX input format, SGML
+ or XML using a publicly available DTD, and standard-conforming simple
+ HTML designed for human modification. Opaque formats include
+ PostScript, PDF, proprietary formats that can be read and edited only
+ by proprietary word processors, SGML or XML for which the DTD and/or
+ processing tools are not generally available, and the
+ machine-generated HTML produced by some word processors for output
+ purposes only.
+
+ The "Title Page" means, for a printed book, the title page itself,
+ plus such following pages as are needed to hold, legibly, the material
+ this License requires to appear in the title page. For works in
+ formats which do not have any title page as such, "Title Page" means
+ the text near the most prominent appearance of the work's title,
+ preceding the beginning of the body of the text.
+
+
+ 2. VERBATIM COPYING
+
+ You may copy and distribute the Document in any medium, either
+ commercially or noncommercially, provided that this License, the
+ copyright notices, and the license notice saying this License applies
+ to the Document are reproduced in all copies, and that you add no other
+ conditions whatsoever to those of this License. You may not use
+ technical measures to obstruct or control the reading or further
+ copying of the copies you make or distribute. However, you may accept
+ compensation in exchange for copies. If you distribute a large enough
+ number of copies you must also follow the conditions in section 3.
+
+ You may also lend copies, under the same conditions stated above, and
+ you may publicly display copies.
+
+
+ 3. COPYING IN QUANTITY
+
+ If you publish printed copies of the Document numbering more than 100,
+ and the Document's license notice requires Cover Texts, you must enclose
+ the copies in covers that carry, clearly and legibly, all these Cover
+ Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+ the back cover. Both covers must also clearly and legibly identify
+ you as the publisher of these copies. The front cover must present
+ the full title with all words of the title equally prominent and
+ visible. You may add other material on the covers in addition.
+ Copying with changes limited to the covers, as long as they preserve
+ the title of the Document and satisfy these conditions, can be treated
+ as verbatim copying in other respects.
+
+ If the required texts for either cover are too voluminous to fit
+ legibly, you should put the first ones listed (as many as fit
+ reasonably) on the actual cover, and continue the rest onto adjacent
+ pages.
+
+ If you publish or distribute Opaque copies of the Document numbering
+ more than 100, you must either include a machine-readable Transparent
+ copy along with each Opaque copy, or state in or with each Opaque copy
+ a publicly-accessible computer-network location containing a complete
+ Transparent copy of the Document, free of added material, which the
+ general network-using public has access to download anonymously at no
+ charge using public-standard network protocols. If you use the latter
+ option, you must take reasonably prudent steps, when you begin
+ distribution of Opaque copies in quantity, to ensure that this
+ Transparent copy will remain thus accessible at the stated location
+ until at least one year after the last time you distribute an Opaque
+ copy (directly or through your agents or retailers) of that edition to
+ the public.
+
+ It is requested, but not required, that you contact the authors of the
+ Document well before redistributing any large number of copies, to give
+ them a chance to provide you with an updated version of the Document.
+
+
+ 4. MODIFICATIONS
+
+ You may copy and distribute a Modified Version of the Document under
+ the conditions of sections 2 and 3 above, provided that you release
+ the Modified Version under precisely this License, with the Modified
+ Version filling the role of the Document, thus licensing distribution
+ and modification of the Modified Version to whoever possesses a copy
+ of it. In addition, you must do these things in the Modified Version:
+
+ A. Use in the Title Page (and on the covers, if any) a title distinct
+ from that of the Document, and from those of previous versions
+ (which should, if there were any, be listed in the History section
+ of the Document). You may use the same title as a previous version
+ if the original publisher of that version gives permission.
+ B. List on the Title Page, as authors, one or more persons or entities
+ responsible for authorship of the modifications in the Modified
+ Version, together with at least five of the principal authors of the
+ Document (all of its principal authors, if it has less than five).
+ C. State on the Title page the name of the publisher of the
+ Modified Version, as the publisher.
+ D. Preserve all the copyright notices of the Document.
+ E. Add an appropriate copyright notice for your modifications
+ adjacent to the other copyright notices.
+ F. Include, immediately after the copyright notices, a license notice
+ giving the public permission to use the Modified Version under the
+ terms of this License, in the form shown in the Addendum below.
+ G. Preserve in that license notice the full lists of Invariant Sections
+ and required Cover Texts given in the Document's license notice.
+ H. Include an unaltered copy of this License.
+ I. Preserve the section entitled "History", and its title, and add to
+ it an item stating at least the title, year, new authors, and
+ publisher of the Modified Version as given on the Title Page. If
+ there is no section entitled "History" in the Document, create one
+ stating the title, year, authors, and publisher of the Document as
+ given on its Title Page, then add an item describing the Modified
+ Version as stated in the previous sentence.
+ J. Preserve the network location, if any, given in the Document for
+ public access to a Transparent copy of the Document, and likewise
+ the network locations given in the Document for previous versions
+ it was based on. These may be placed in the "History" section.
+ You may omit a network location for a work that was published at
+ least four years before the Document itself, or if the original
+ publisher of the version it refers to gives permission.
+ K. In any section entitled "Acknowledgements" or "Dedications",
+ preserve the section's title, and preserve in the section all the
+ substance and tone of each of the contributor acknowledgements
+ and/or dedications given therein.
+ L. Preserve all the Invariant Sections of the Document,
+ unaltered in their text and in their titles. Section numbers
+ or the equivalent are not considered part of the section titles.
+ M. Delete any section entitled "Endorsements". Such a section
+ may not be included in the Modified Version.
+ N. Do not retitle any existing section as "Endorsements"
+ or to conflict in title with any Invariant Section.
+
+ If the Modified Version includes new front-matter sections or
+ appendices that qualify as Secondary Sections and contain no material
+ copied from the Document, you may at your option designate some or all
+ of these sections as invariant. To do this, add their titles to the
+ list of Invariant Sections in the Modified Version's license notice.
+ These titles must be distinct from any other section titles.
+
+ You may add a section entitled "Endorsements", provided it contains
+ nothing but endorsements of your Modified Version by various
+ parties--for example, statements of peer review or that the text has
+ been approved by an organization as the authoritative definition of a
+ standard.
+
+ You may add a passage of up to five words as a Front-Cover Text, and a
+ passage of up to 25 words as a Back-Cover Text, to the end of the list
+ of Cover Texts in the Modified Version. Only one passage of
+ Front-Cover Text and one of Back-Cover Text may be added by (or
+ through arrangements made by) any one entity. If the Document already
+ includes a cover text for the same cover, previously added by you or
+ by arrangement made by the same entity you are acting on behalf of,
+ you may not add another; but you may replace the old one, on explicit
+ permission from the previous publisher that added the old one.
+
+ The author(s) and publisher(s) of the Document do not by this License
+ give permission to use their names for publicity for or to assert or
+ imply endorsement of any Modified Version.
+
+
+ 5. COMBINING DOCUMENTS
+
+ You may combine the Document with other documents released under this
+ License, under the terms defined in section 4 above for modified
+ versions, provided that you include in the combination all of the
+ Invariant Sections of all of the original documents, unmodified, and
+ list them all as Invariant Sections of your combined work in its
+ license notice.
+
+ The combined work need only contain one copy of this License, and
+ multiple identical Invariant Sections may be replaced with a single
+ copy. If there are multiple Invariant Sections with the same name but
+ different contents, make the title of each such section unique by
+ adding at the end of it, in parentheses, the name of the original
+ author or publisher of that section if known, or else a unique number.
+ Make the same adjustment to the section titles in the list of
+ Invariant Sections in the license notice of the combined work.
+
+ In the combination, you must combine any sections entitled "History"
+ in the various original documents, forming one section entitled
+ "History"; likewise combine any sections entitled "Acknowledgements",
+ and any sections entitled "Dedications". You must delete all sections
+ entitled "Endorsements."
+
+
+ 6. COLLECTIONS OF DOCUMENTS
+
+ You may make a collection consisting of the Document and other documents
+ released under this License, and replace the individual copies of this
+ License in the various documents with a single copy that is included in
+ the collection, provided that you follow the rules of this License for
+ verbatim copying of each of the documents in all other respects.
+
+ You may extract a single document from such a collection, and distribute
+ it individually under this License, provided you insert a copy of this
+ License into the extracted document, and follow this License in all
+ other respects regarding verbatim copying of that document.
+
+
+ 7. AGGREGATION WITH INDEPENDENT WORKS
+
+ A compilation of the Document or its derivatives with other separate
+ and independent documents or works, in or on a volume of a storage or
+ distribution medium, does not as a whole count as a Modified Version
+ of the Document, provided no compilation copyright is claimed for the
+ compilation. Such a compilation is called an "aggregate", and this
+ License does not apply to the other self-contained works thus compiled
+ with the Document, on account of their being thus compiled, if they
+ are not themselves derivative works of the Document.
+
+ If the Cover Text requirement of section 3 is applicable to these
+ copies of the Document, then if the Document is less than one quarter
+ of the entire aggregate, the Document's Cover Texts may be placed on
+ covers that surround only the Document within the aggregate.
+ Otherwise they must appear on covers around the whole aggregate.
+
+
+ 8. TRANSLATION
+
+ Translation is considered a kind of modification, so you may
+ distribute translations of the Document under the terms of section 4.
+ Replacing Invariant Sections with translations requires special
+ permission from their copyright holders, but you may include
+ translations of some or all Invariant Sections in addition to the
+ original versions of these Invariant Sections. You may include a
+ translation of this License provided that you also include the
+ original English version of this License. In case of a disagreement
+ between the translation and the original English version of this
+ License, the original English version will prevail.
+
+
+ 9. TERMINATION
+
+ You may not copy, modify, sublicense, or distribute the Document except
+ as expressly provided for under this License. Any other attempt to
+ copy, modify, sublicense or distribute the Document is void, and will
+ automatically terminate your rights under this License. However,
+ parties who have received copies, or rights, from you under this
+ License will not have their licenses terminated so long as such
+ parties remain in full compliance.
+
+
+ 10. FUTURE REVISIONS OF THIS LICENSE
+
+ The Free Software Foundation may publish new, revised versions
+ of the GNU Free Documentation License from time to time. Such new
+ versions will be similar in spirit to the present version, but may
+ differ in detail to address new problems or concerns. See
+ http://www.gnu.org/copyleft/.
+
+ Each version of the License is given a distinguishing version number.
+ If the Document specifies that a particular numbered version of this
+ License "or any later version" applies to it, you have the option of
+ following the terms and conditions either of that specified version or
+ of any later version that has been published (not as a draft) by the
+ Free Software Foundation. If the Document does not specify a version
+ number of this License, you may choose any version ever published (not
+ as a draft) by the Free Software Foundation.
+
+
+ ADDENDUM: How to use this License for your documents
+
+ To use this License in a document you have written, include a copy of
+ the License in the document and put the following copyright and
+ license notices just after the title page:
+
+ Copyright (c) YEAR YOUR NAME.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.1
+ or any later version published by the Free Software Foundation;
+ with the Invariant Sections being LIST THEIR TITLES, with the
+ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+
+ If you have no Invariant Sections, write "with no Invariant Sections"
+ instead of saying which ones are invariant. If you have no
+ Front-Cover Texts, write "no Front-Cover Texts" instead of
+ "Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
+
+ If your document contains nontrivial examples of program code, we
+ recommend releasing these examples in parallel under your choice of
+ free software license, such as the GNU General Public License,
+ to permit their use in free software.
Modified: kde-extras/krecipes/trunk/debian/krecipes-data.install
===================================================================
--- kde-extras/krecipes/trunk/debian/krecipes-data.install 2009-06-06 03:26:38 UTC (rev 14885)
+++ kde-extras/krecipes/trunk/debian/krecipes-data.install 2009-06-06 04:48:32 UTC (rev 14886)
@@ -1,4 +1,3 @@
-debian/tmp/usr/share/applnk
debian/tmp/usr/share/apps
debian/tmp/usr/share/icons
debian/tmp/usr/share/locale
Added: kde-extras/krecipes/trunk/debian/krecipes-data.manpages
===================================================================
--- kde-extras/krecipes/trunk/debian/krecipes-data.manpages (rev 0)
+++ kde-extras/krecipes/trunk/debian/krecipes-data.manpages 2009-06-06 04:48:32 UTC (rev 14886)
@@ -0,0 +1 @@
+debian/krecipes.1
Added: kde-extras/krecipes/trunk/debian/krecipes.1
===================================================================
--- kde-extras/krecipes/trunk/debian/krecipes.1 (rev 0)
+++ kde-extras/krecipes/trunk/debian/krecipes.1 2009-06-06 04:48:32 UTC (rev 14886)
@@ -0,0 +1,187 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH KRECIPES 1 "May 2009"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+Krecipes \- The KDE Cookbook
+.SH SYNOPSIS
+.B krecipes
+[Qt\-options] [KDE\-options] [options]
+.SH DESCRIPTION
+.B Krecipes
+is a program that lets you to manage your recipes, create shopping
+lists, choose a recipe based on available ingredients and plan your
+menu/diet in advance.
+.PP
+This manual page briefly describes its command line options.
+.SH OPTIONS
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+.TP
+.B \-\-convert-sqlite3
+Convert the current SQLite 2.x database to SQLite 3 and exit
+.SS Generic options:
+.TP
+.B \-\-help
+Show help about options
+.TP
+.B \-\-help\-qt
+Show Qt specific options
+.TP
+.B \-\-help\-kde
+Show KDE specific options
+.TP
+.B \-\-help\-all
+Show all options
+.TP
+.B \-\-author
+Show author information
+.TP
+.B \-v, \-\-version
+Show version information
+.TP
+.B \-\-license
+Show license information
+.TP
+.B \-\-
+End of options
+.SS Qt options
+.TP
+.B \-\-display <displayname>
+Use the X\-server display 'displayname'
+.TP
+.B \-\-session <sessionId>
+Restore the application for the given 'sessionId'
+.TP
+.B \-\-cmap
+Causes the application to install a private color map on an 8-bit
+display
+.TP
+.B \-\-ncols <count>
+Limits the number of colors allocated in the color cube on an 8-bit
+display, if the application is using the QApplication::ManyColor color
+specification
+.TP
+.B \-\-nograb
+tells Qt to never grab the mouse or the keyboard
+.TP
+.B --dograb
+running under a debugger can cause an implicit \-nograb, use \-dograb
+to override
+.TP
+.B \-\-sync
+switches to synchronous mode for debugging
+.TP
+.B \-\-fn, \-\-font <fontname>
+defines the application font
+.TP
+.B \-\-bg, \-\-background <color>
+sets the default background color and an application palette (light
+and dark shades are calculated)
+.TP
+.B \-\-fg, \-\-foreground <color>
+sets the default foreground color
+.TP
+.B \-\-btn, \-\-button <color>
+sets the default button color
+.TP
+.B \-\-name <name>
+sets the application name
+.TP
+.B \-\-title <title>
+sets the application title (caption)
+.TP
+.B \-\-visual TrueColor
+forces the application to use a TrueColor visual on an 8\-bit display
+.TP
+.B \-\-inputstyle <inputstyle>
+sets XIM (X Input Method) input style. Possible values are onthespot,
+overthespot, offthespot and root
+.TP
+.B \-\-im <XIM server>
+set XIM server
+.TP
+.B \-\-noxim
+disable XIM
+.TP
+.B \-\-reverse
+mirrors the whole layout of widgets
+.SS KDE options
+.TP
+.B \-\-caption <caption>
+Use 'caption' as name in the titlebar
+.TP
+.B \-\-icon <icon>
+Use 'icon' as the application icon
+.TP
+.B \-\-miniicon <icon>
+Use 'icon' as the icon in the titlebar
+.TP
+.B \-\-config <filename>
+Use alternative configuration file
+.TP
+.B \-\-dcopserver <server>
+Use the DCOP Server specified by 'server'
+.TP
+.B \-\-nocrashhandler
+Disable crash handler, to get core dumps
+.TP
+.B \-\-waitforwm
+Waits for a WM_NET compatible windowmanager
+.TP
+.B \-\-style <style>
+sets the application GUI style
+.TP
+.B \-\-geometry <geometry>
+sets the client geometry of the main widget \- see man X for the
+argument format
+.TP
+.B \-\-nofork
+Don't run in the background.
+
+.SH FILES
+.TP
+.I ~/.kde/share/config/krecipesrc
+.B Krecipes
+configuration file
+.SH SEE ALSO
+Full user documentation is available through the KDE Help Center. You
+can also enter the URL
+.BR help:/krecipes/
+directly into konqueror or you can run
+.BR "khelpcenter help:/krecipes/"
+from the command\-line.
+
+.SH AUTHORS
+.nf
+Jason Kivlighn <jkivlighn at gmail.com>
+.br
+Unai Garro <ugarro at users.sourceforge.net>
+.br
+Cyril Bosselut <bosselut at b1project.com>
+.br
+.fi
+Please use http://bugs.kde.org to report bugs; do not mail the authors
+directly.
+.PP
+This manual page was written by Matthias Julius <mdeb at julius-net.net>,
+for the Debian project (and may be used by others). Permission is
+granted to copy, distribute and/or modify this document under the
+terms of the GNU General Public License, Version 2 or any later
+version published by the Free Software Foundation.
+.PP
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in /usr/share/common\-licenses/GPL\-2.
Modified: kde-extras/krecipes/trunk/debian/krecipes.install
===================================================================
--- kde-extras/krecipes/trunk/debian/krecipes.install 2009-06-06 03:26:38 UTC (rev 14885)
+++ kde-extras/krecipes/trunk/debian/krecipes.install 2009-06-06 04:48:32 UTC (rev 14886)
@@ -1 +1,2 @@
debian/tmp/usr/bin
+debian/tmp/usr/share/applications
Added: kde-extras/krecipes/trunk/debian/krecipes.lintian-overrides
===================================================================
--- kde-extras/krecipes/trunk/debian/krecipes.lintian-overrides (rev 0)
+++ kde-extras/krecipes/trunk/debian/krecipes.lintian-overrides 2009-06-06 04:48:32 UTC (rev 14886)
@@ -0,0 +1,4 @@
+# Don't warn about missing icon file as this is in the -data package
+krecipes binary: menu-icon-missing /usr/share/pixmaps/krecipes.xpm
+# Don't warn about missing man page as this is in the -data package
+krecipes binary: binary-without-manpage usr/bin/krecipes
Modified: kde-extras/krecipes/trunk/debian/krecipes.menu
===================================================================
--- kde-extras/krecipes/trunk/debian/krecipes.menu 2009-06-06 03:26:38 UTC (rev 14885)
+++ kde-extras/krecipes/trunk/debian/krecipes.menu 2009-06-06 04:48:32 UTC (rev 14886)
@@ -1,6 +1,6 @@
?package(krecipes): \
needs="x11" \
- section="Apps/Tools" \
+ section="Applications/Data Management" \
hints="KDE" \
title="Krecipes" \
icon="/usr/share/pixmaps/krecipes.xpm" \
Modified: kde-extras/krecipes/trunk/debian/rules
===================================================================
--- kde-extras/krecipes/trunk/debian/rules 2009-06-06 03:26:38 UTC (rev 14885)
+++ kde-extras/krecipes/trunk/debian/rules 2009-06-06 04:48:32 UTC (rev 14886)
@@ -1,6 +1,4 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
-# This file is public domain.
DEB_AUTO_CLEANUP_RCS := yes
@@ -14,6 +12,10 @@
install/krecipes-data::
install -D -m 644 -g root -o root debian/krecipes.xpm debian/tmp/usr/share/pixmaps/krecipes.xpm
+install/krecipes::
+ install -D -m 644 -g root -o root debian/tmp/usr/share/applnk/Utilities/krecipes.desktop debian/tmp/usr/share/applications/krecipes.desktop
+ chrpath -d debian/tmp/usr/bin/krecipes
+
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]
Added: kde-extras/krecipes/trunk/debian/watch
===================================================================
--- kde-extras/krecipes/trunk/debian/watch (rev 0)
+++ kde-extras/krecipes/trunk/debian/watch 2009-06-06 04:48:32 UTC (rev 14886)
@@ -0,0 +1,4 @@
+version=3
+
+opts="uversionmangle=s/-/~/" \
+ http://sf.net/krecipes/krecipes-(.+)\.tar\.gz
\ No newline at end of file
More information about the pkg-kde-commits
mailing list