rev 14361 - in kde-extras/kipi-plugins: branches trunk/debian trunk/debian/patches
Mark Purcell
msp at alioth.debian.org
Sat Apr 11 01:50:34 UTC 2009
Author: msp
Date: 2009-04-11 01:50:34 +0000 (Sat, 11 Apr 2009)
New Revision: 14361
Removed:
kde-extras/kipi-plugins/branches/kde4/
kde-extras/kipi-plugins/trunk/debian/TODO
kde-extras/kipi-plugins/trunk/debian/kipi-plugins-doc.install
kde-extras/kipi-plugins/trunk/debian/kipi-plugins.manpages
kde-extras/kipi-plugins/trunk/debian/patches/10_use-icedove-instead-of-thunderbird.diff
kde-extras/kipi-plugins/trunk/debian/patches/20_420mpeg2.diff
kde-extras/kipi-plugins/trunk/debian/patches/30_kipi_libgpod7.diff
kde-extras/kipi-plugins/trunk/debian/patches/50_images2mpg_default_bin_folder.diff
Modified:
kde-extras/kipi-plugins/trunk/debian/changelog
kde-extras/kipi-plugins/trunk/debian/compat
kde-extras/kipi-plugins/trunk/debian/control
kde-extras/kipi-plugins/trunk/debian/copyright
kde-extras/kipi-plugins/trunk/debian/kipi-plugins.install
kde-extras/kipi-plugins/trunk/debian/rules
kde-extras/kipi-plugins/trunk/debian/watch
Log:
Merge branches/kde4 changes r12488:14359 into trunk
Modified: kde-extras/kipi-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/changelog 2009-04-11 01:36:25 UTC (rev 14360)
+++ kde-extras/kipi-plugins/trunk/debian/changelog 2009-04-11 01:50:34 UTC (rev 14361)
@@ -1,3 +1,35 @@
+kipi-plugins (0.2.0-3) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ -- Mark Purcell <msp at debian.org> Thu, 09 Apr 2009 23:03:14 +1000
+
+kipi-plugins (0.2.0-2) unstable; urgency=low
+
+ [ Luka Renko ]
+ * debian/copyright: add Adobe DNG SDK license, update Authors
+ * debian/control: update plugin description, update Suggests
+
+ [ Mark Purcell ]
+ * Upload to unstable (KDE4 is here ;-)
+
+ -- Mark Purcell <msp at debian.org> Thu, 09 Apr 2009 19:53:52 +1000
+
+kipi-plugins (0.2.0-1) experimental; urgency=low
+
+ * New upstream release
+ - Fixes "kipi-plugins 0.2.0~rc2-1 for KDE4 on amd64" (Closes: #518765)
+ * Build-Depends: libgpod-dev
+
+ -- Mark Purcell <msp at debian.org> Tue, 17 Mar 2009 22:30:53 +1100
+
+kipi-plugins (0.2.0~rc2-1) experimental; urgency=low
+
+ * New upstream release
+ - rc version upload to experimental
+
+ -- Mark Purcell <msp at debian.org> Sun, 15 Feb 2009 11:04:47 +1100
+
kipi-plugins (0.1.7-3) unstable; urgency=low
* Fix "Doesn't build with libgpod/0.7.0" (Closes: #518838)
@@ -21,6 +53,27 @@
-- Mark Purcell <msp at debian.org> Mon, 02 Feb 2009 21:37:06 +1100
+kipi-plugins (0.2.0~rc1-1) experimental; urgency=low
+
+ [ Mark Purcell ]
+ * New upstream release (KDE4.2)
+ - Fixes "kipi-plugins missing from kde4 (experimental)" <explain what
+ you changed and why> (Closes: #491746)
+ - debian/kipi-plugins.install changes
+ - remove package kipi-plugins-doc - missing upstream
+ - remove debian/kipi-plugins.manpages
+ - Update Build-Depends to KDE4.2 libs
+ * Update Description to list current plugins
+ * Add {misc:Depends}
+ * Build-Depends: libcv-dev
+
+ [ Modestas Vainius ]
+ * Add libsane-dev, libpng-dev, libxrandr-dev, libexpat1-dev to
+ Build-Depends.
+ * Add 01_fix_ipodexport_linkage.diff patch to make Ipodexport build.
+
+ -- Mark Purcell <msp at debian.org> Thu, 29 Jan 2009 19:58:22 +1100
+
kipi-plugins (0.1.6-1) experimental; urgency=low
* New upstream release for KDE3
Modified: kde-extras/kipi-plugins/trunk/debian/compat
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/compat 2009-04-11 01:36:25 UTC (rev 14360)
+++ kde-extras/kipi-plugins/trunk/debian/compat 2009-04-11 01:50:34 UTC (rev 14361)
@@ -1 +1 @@
-5
+7
Modified: kde-extras/kipi-plugins/trunk/debian/control
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/control 2009-04-11 01:36:25 UTC (rev 14360)
+++ kde-extras/kipi-plugins/trunk/debian/control 2009-04-11 01:50:34 UTC (rev 14361)
@@ -3,21 +3,28 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Achim Bohnet <ach at mpe.mpg.de>, Fathi Boudra <fabo at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), pkg-config, kdelibs4-dev,
- libexiv2-dev (>= 0.16), libgphoto2-2-dev, libgpod-dev (>= 0.7.0),
- libkcal2-dev, libkdcraw-dev (>= 0.1.4), libkexiv2-dev (>= 0.1.6),
- libkipi0-dev (>= 0.1.5), libltdl3-dev, libtiff4-dev, libxslt1-dev
+Build-Depends: cdbs, debhelper (>= 7), pkg-config,
+ libgphoto2-2-dev,
+ kdelibs5-dev,
+ kdepimlibs5-dev,
+ libkipi6-dev, libkexiv2-7-dev, libkdcraw7-dev,
+ libexiv2-dev,
+ libltdl3-dev, libpng-dev, libtiff4-dev, libxslt1-dev,
+ libcv-dev,
+ libxrandr-dev, libexpat1-dev,
+ libgpod-dev,
+ libsane-dev, libksane-dev (>= 4:4.1.85), libqt4-opengl-dev
Standards-Version: 3.8.0
Homepage: http://www.kipi-plugins.org/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kipi-plugins/trunk/?op=log
-Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kipi-plugins/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kipi-plugins/branches/kde4/?op=log
+Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/kipi-plugins/branches/kde4
Package: kipi-plugins
Replaces: digikamplugins
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), kdeprint, konqueror
-Suggests: gallery, gimp, k3b, kipi-plugins-doc, kmail, kooka, mpg123, vorbis-tools, sane-utils
+Recommends: graphicsmagick-imagemagick-compat (>=1.1.7) | imagemagick (>=5.4.8), konqueror
+Suggests: gallery, gimp, kmail, vorbis-tools
Enhances: digikam, gwenview, kphotoalbum, showimg
Description: image manipulation/handling plugins for KIPI aware programs
KIPI plugins (KDE Image Plugin Interface) is an effort to develop a
@@ -25,65 +32,46 @@
KimDaBa), Showimg and Gwenview.
Its aim is to share image plugins among graphic applications.
.
- Plugins available are:
+ Current plugins ported to Qt4/KDE4:
.
- RawConverter: Raw image converter for digital cameras
- SlideShow: Slideshow with effects ripped out from kslideshow
- and 3D effects using OpenGL
- MpegEncoder: Create an MPEG slideshow from your images
- PrintWizard: A wizard to print images in various format
- JpegLossLess: Batch process your JPEG images without losing meta
- information and compression
- CdArchiving: Archive your albums on CD or DVD using K3b
- ScanImages: Scanner management using Kooka
- ScreenshotImages: Snap screen based on KSnapshot and adapted to Kipi
- Calendar: Sreate calendars with images
- SendImages: Send images by email, allowing resizing
- and recompressing before sending
- RenameImages: Batch image renamer
- ConvertImages: Batch image converter
- BorderImages: Add border to your images in batch
- FilterImages: Batch image enhancer using digital filters
- ColorImages: Batch image color enhancer
- EffectImages: Batch image transformation effects
- ResizeImages: Batch image resizer
- RecompressImages: Batch image recompressor
- FindDuplicateImages: Find duplicate images in albums
- TimeAdjust: Adjust image file time and date
- WallPaper: Set your image as wallpaper
- FindImages: Search images in albums
- GalleryExport: Interface for export images collections to remote
- Gallery (and Gallery 2) servers
- FlickrExport: Export images to a remote Flickr web service
- HTMLGallery: Export images to HTML
- SimpleviewerExport: Export images in a nice flash movie
- GPSSync: Geolocalize pictures
- MetadataEdit: Edit EXIF and IPTC pictures metadata
- IpodExport: Export images to an ipod device
- PicasaWebExport: Export pictures to Picasa web service
+ AcquireImages : acquire images using flat scanner
+ AdvancedSlideShow : Slide images with 2D and 3D effects using OpenGL
+ Calendar : create calendars
+ DngConverter : convert Raw Image to Digital NeGative
+ Facebook : import/export images to a remote Facebook web service
+ FlashExport : export images to Flash using SimpleViewer
+ FlickrExport : export images to a remote Flickr/23hq web service
+ GalleryExport : export images to a remote Gallery
+ GPSSync : geolocalize pictures
+ HTMLExport : export images collections into a static XHTML
+ ImageViewer : preview images using OpenGL
+ JpegLossLess : rotate/flip images without losing quality
+ MetadataEdit : edit EXIF, IPTC and XMP metadata
+ PicasaWebExport : export images to a remote Picasa web service
+ PrintImages : print images in various format
+ RawConverter : convert Raw Image to JPEG/PNG/TIFF
+ RemoveRedEyes : remove red eyes on image automatically
+ SendImages : send images by e-mail
+ Smug : import/export images to a remote SmugMug web service
+ TimeAdjust : adjust date and time
.
- Documentation of the plugins is available in the package kipi-plugins-doc.
+ Porting under progress to Qt4/KDE4:
+ .
+ BatchProcess : batch process images (convert, resize, rename, etc)
+ IpodExport : export pictures to an Ipod device
+ WallPaper : set image as background on your desktop
+ .
+ Not yet ported to Qt4/KDE4:
+ .
+ CDArchiving : archive your image collections to a CD or DVD
+ MpegEncoder : create an MPEG slideshow with a set of images
Package: kipi-plugins-doc
Architecture: all
Section: doc
-Depends: khelpcenter, ${misc:Depends}
+Depends: ${misc:Depends}
+Recommends: khelpcenter4
Suggests: kipi-plugins
-Replaces: kipi-plugins (<= 0.1.3-2)
-Description: kipi-plugins documentation
- KIPI plugins (KDE Image Plugin Interface) is an effort to develop a
- common plugin structure for Digikam, KPhotoAlbum (formerly known as
- KimDaBa), Showimg and Gwenview.
- Its aim is to share image plugins among graphic applications.
- .
- Kipi-plugins-doc contains the handbooks for the following languages:
- .
- de - German
- en - English
- es - Spanish
- et - Estonian
- it - Italien
- nl - Dutch
- pt(BR) - Brazilian
- sv - Swedish
+Description: kipi-plugins documentation - transition package
+ This is an empty transition package while upstream rewrite the documentation.
Modified: kde-extras/kipi-plugins/trunk/debian/copyright
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/copyright 2009-04-11 01:36:25 UTC (rev 14360)
+++ kde-extras/kipi-plugins/trunk/debian/copyright 2009-04-11 01:50:34 UTC (rev 14361)
@@ -7,20 +7,23 @@
MAIN DEVELOPERS:
- Gilles Caulier <caulier.gilles at kdemail.net>
+ Gilles Caulier <caulier.gilles at gmail.com>
Marcel Wiesweg <marcel.wiesweg at gmx.de>
Vardhman Jain <vardhman at gmail.com>
Colin Guthrie <kde at colin.guthr.ie>
Aurelien Gateau <aurelien.gateau at free.fr>
Valerio Fuoglio <valerio.fuoglio at gmail.com>
Angelo Naselli <anaselli at linux.it>
- Seb Ruiz <me at sebruiz.net>
- Jesper K. Pedersen <blackie at kde.org>
+ Kare Sars <kare.sars at kolumbus.fi>
+ Andrea Diamantini <adjam7 at gmail.com>
+ Andi Clemens <andi.clemens at gmx.net>
+ Patrick Spendrin <patrick_spendrin at gmx.de>
CONTRIBUTORS:
Gerhard Kulzer <gerhard at kulzer.net>
Orgad Shaneh <orgads at gmail.com>
+ Seb Ruiz <me at sebruiz.net>
Achim Bohnet <ach at mpe.mpg.de>
Michael Höchstetter <michae.hoechstetter at gmx.de>
Joern Ahrens <joern.ahrens at kdemail.net>
@@ -28,6 +31,8 @@
Beth Marmorstein <purplegamba at cox.net>
Tudor Calin <tudor at 1xtech.com>
Robert Marmorstein <rmmarm at sdf.lonestar.org>
+ Jesper K. Pedersen <blackie at kde.org>
+ Luka Renko <lure at kubuntu.org>
Owen Hirst <n8rider at sbcglobal.net>
Richard Groult <Richard.Groult at jalix.org>
Todd Shoemaker <todd at theshoemakers.net>
@@ -36,44 +41,55 @@
Stéphane Pontier <shadow.walker at free.fr>
Lukas Tinkl <lukas at kde.org>
Andreas Schlapbach <schlpbch at iam.unibe.ch>
+ Stephan Stapel <stephan.stapel at web.de>
+ Stephane Pontier <shadow.walker at free.fr>
+ Dave Grossman <dgrossman at cdr.stanford.edu>
+ Enrico Ros <eros.kde at email.it>
+ David Faure <faure at kde.org>
+ Laurent Montel <montel at kde.org>
+ Aaron J. Seigo <aseigo at kde.org>
Marti Maria
Richard J. Moore
Matthias Ettrich
- Aaron J. Seigo
+ Free Software Foundation, Inc.
+ Adobe Systems, Inc.
FORMER MAINTAINER:
Renchi Raju <renchi at pooh.tam.uiuc.edu>
Tom Albers <tomalbers at kde.nl>
Ralf Hoelzer <kde at ralfhoelzer.com>
+ Joern Ahrens <joern.ahrens at kdemail.net>
+
PLUGINS MAINTAINERS:
Acquire Images: Jesper K. Pedersen <blackie at kde.org>
+ Advanced Slideshow: Valerio Fuoglio <valerio.ulteo.com>
Batch Process: Aurelien Gateau <aurelien.gateau at free.fr>
Calendar: Orgad Shaneh <orgads at gmail.com>
- CD Archiving: Angelo Naselli <anaselli at linux.it>
- Find Images: Jesper K. Pedersen <blackie at kde.org>
- Richard Groult <Richard.Groult at jalix.org>
+ Facebook Import/Export: Luka Renko <lure at kubuntu.org>
+ Flash Export: Gilles Caulier <caulier.gilles at gmail.com>
Flickr Export: Vardhman Jain <vardhman at gmail.com>
+ Gilles Caulier <caulier.gilles at gmail.com>
Gallery Export: Colin Guthrie <kde at colin.guthr.ie>
- GPSSync: Gilles Caulier <caulier.gilles at kdemail.net>
+ Andrea Diamantini <adjam7 at gmail.com>
+ GPSSync: Gilles Caulier <caulier.gilles at gmail.com>
HTML Export: Aurelien Gateau <aurelien.gateau at free.fr>
Image Viewer: Markus Leuthold <kusi at forum.titlis.org>
IPod Export: Seb Ruiz <me at sebruiz.net>
- Jpeglossless: Gilles Caulier <caulier.gilles at kdemail.net>
- Kamera Klient: Aurelien Gateau <aurelien.gateau at free.fr>
- Michael J. Gruber <michaeljgruber+kphotoalbum at fastmail.fm>
- MetadataEdit: Gilles Caulier <caulier.gilles at kdemail.net>
- MPEG Encoder: Angelo Naselli <anaselli at linux.it>
- Valerio Fuoglio <valerio.fuoglio at gmail com>
+ Jpeglossless: Gilles Caulier <caulier.gilles at gmail.com>
+ Marcel Wiesweg <marcel.wiesweg at gmx.de>
+ MetadataEdit: Gilles Caulier <caulier.gilles at gmail.com>
Picasa Web Export: Vardhman Jain <vardhman at gmail.com>
- Print Wizard: Angelo Naselli <anaselli at linux.it>
- RAW Converter: Gilles Caulier <caulier.gilles at kdemail.net>
+ Gilles Caulier <caulier.gilles at gmail.com>
+ Print Images: Angelo Naselli <anaselli at linux.it>
+ RAW Converter: Gilles Caulier <caulier.gilles at gmail.com>
+ Marcel Wiesweg <marcel.wiesweg at gmx.de>
+ RemoveRedEyes: Andi Clemens <andi.clemens at gmx.net>
Sendimages: Michael Höchstetter <michael.hoechstetter at gmx.de>
- Simpleviewer Export: Joern Ahrens <joern.ahrens at kdemail.net>
- Slideshow: Valerio Fuoglio <valerio.ulteo.com>
- Time Adjust: Gilles Caulier <caulier.gilles at kdemail.net>
+ Smug Import/Export: Luka Renko <lure at kubuntu.org>
+ Time Adjust: Gilles Caulier <caulier.gilles at gmail.com>
Wallpaper: Jesper K. Pedersen <blackie at kde.org>
Documentation:
@@ -85,11 +101,11 @@
The plugins use the GPL:
- acquireimage, batchprocessimages, calendar, cdarching,
- findimages, helloworld, gpssync, ipodexport, jpeglossless, galleryexport
- kameraimage, metadataedit, mpegencoder, printwizard, rawconverter,
- sendimages, simpleviewer, slideshow, timeadjust, flickrexport,
- ipodexport, gpssync, metadata, wallpaper and picasawebexport.
+ acquireimage, advancedslideshow, batchprocessimages, calendar,
+ dngconverter, facebook, flashexport, flickrexport, galeryexport,
+ gpssync, htmlexport, imageviewer, ipodexport, jpeglossless,
+ metadataedit, picasawebexport, printimages, rawconverter,
+ removeredeyes, sendimages, smug, timeadjust and wallpaper.
For GPL two variants are used one with and one without the 3rd paragraph:
@@ -255,6 +271,135 @@
[...]
+
+dngconverter plugin includes DNG SDK from Adobe which is located in
+kipi-plugins/dngconverter/dngwriter/extra/dng_sdk
+
+DNG SDK license is a non-copyleft free software license, compatible
+with the GNU GPL.
+
+The documentation clauses are non-free but no relevant documentation
+is included.
+
+It was downloaded from
+http://www.adobe.com/support/downloads/dng/dng_sdk_eula_win.html
+
+-----
+
+DNG SDK License Agreement
+
+NOTICE TO USER:
+
+ Adobe Systems Incorporated provides the Software and Documentation
+ for use under the terms of this Agreement. Any download,
+ installation, use, reproduction, modification or distribution of the
+ Software or Documentation, or any derivatives or portions thereof,
+ constitutes your acceptance of this Agreement.
+
+ As used in this Agreement, "Adobe" means Adobe Systems
+ Incorporated. "Software" means the software code, in any format,
+ including sample code and source code, accompanying this
+ Agreement. "Documentation" means the documents, specifications and
+ all other items accompanying this Agreement other than the Software.
+
+1. LICENSE GRANT
+
+ Software License. Subject to the restrictions below and other terms
+ of this Agreement, Adobe hereby grants you a non-exclusive,
+ worldwide, royalty free license to use, reproduce, prepare derivative
+ works from, publicly display, publicly perform, distribute and
+ sublicense the Software for any purpose.
+
+ Document License. Subject to the terms of this Agreement, Adobe
+ hereby grants you a non-exclusive, worldwide, royalty free license to
+ make a limited number of copies of the Documentation for your
+ development purposes and to publicly display, publicly perform and
+ distribute such copies. You may not modify the Documentation.
+
+2. RESTRICTIONS AND OWNERSHIP
+
+ You will not remove any copyright or other notice included in the Software or Documentation and you will include such notices in any copies of the Software that you distribute in human-readable format.
+
+ You will not copy, use, display, modify or distribute the Software or
+ Documentation in any manner not permitted by this Agreement. No title
+ to the intellectual property in the Software or Documentation is
+ transferred to you under the terms of this Agreement. You do not
+ acquire any rights to the Software or the Documentation except as
+ expressly set forth in this Agreement. All rights not granted are
+ reserved by Adobe.
+
+3. DISCLAIMER OF WARRANTY
+
+ ADOBE PROVIDES THE SOFTWARE AND DOCUMENTATION ONLY ON AN "AS IS"
+ BASIS WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+ IMPLIED, INCLUDING WITHOUT LIMITATION ANY WARRANTIES OR CONDITIONS OF
+ TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+ PURPOSE. ADOBE MAKES NO WARRANTY THAT THE SOFTWARE OR DOCUMENTATION
+ WILL BE ERROR-FREE. To the extent permissible, any warranties that
+ are not and cannot be excluded by the foregoing are limited to ninety
+ (90) days.
+
+4. LIMITATION OF LIABILITY
+
+ ADOBE AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR LOSS OR DAMAGE
+ ARISING OUT OF THIS AGREEMENT OR FROM THE USE OF THE SOFTWARE OR
+ DOCUMENTATION. IN NO EVENT WILL ADOBE BE LIABLE TO YOU OR ANY THIRD
+ PARTY FOR ANY DIRECT, INDIRECT, CONSEQUENTIAL, INCIDENTAL, OR SPECIAL
+ DAMAGES INCLUDING LOST PROFITS, LOST SAVINGS, COSTS, FEES, OR
+ EXPENSES OF ANY KIND ARISING OUT OF ANY PROVISION OF THIS AGREEMENT
+ OR THE USE OR THE INABILITY TO USE THE SOFTWARE OR DOCUMENTATION,
+ HOWEVER CAUSED AND UNDER ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGES. ADOBE'S AGGREGATE LIABILITY AND THAT OF ITS SUPPLIERS UNDER
+ OR IN CONNECTION WITH THIS AGREEMENT SHALL BE LIMITED TO THE AMOUNT
+ PAID BY YOU FOR THE SOFTWARE AND DOCUMENTATION.
+
+5. INDEMNIFICATION
+
+ If you choose to distribute the Software in a commercial product, you
+ do so with the understanding that you agree to defend, indemnify and
+ hold harmless Adobe against any losses, damages and costs arising
+ from the claims, lawsuits or other legal actions arising out of such
+ distribution.
+
+6. TRADEMARK USAGE
+
+ Adobe and the DNG logo are the trademarks or registered trademarks of
+ Adobe Systems Incorporated in the United States and other
+ countries. Such trademarks may not be used to endorse or promote any
+ product unless expressly permitted under separate agreement with
+ Adobe. For information on how to license the DNG logo please go to
+ www.adobe.com.
+
+7. TERM
+
+ Your rights under this Agreement shall terminate if you fail to
+ comply with any of the material terms or conditions of this
+ Agreement. If all your rights under this Agreement terminate, you
+ will immediately cease use and distribution of the Software and
+ Documentation.
+
+8. GOVERNING LAW AND JURISDICTION.
+
+ This Agreement is governed by the statutes and laws of the State of
+ California, without regard to the conflicts of law principles
+ thereof. The federal and state courts located in Santa Clara County,
+ California, USA, will have non-exclusive jurisdiction over any
+ dispute arising out of this Agreement.
+
+9. GENERAL
+
+ This Agreement supersedes any prior agreement, oral or written,
+ between Adobe and you with respect to the licensing to you of the
+ Software and Documentation. No variation of the terms of this
+ Agreement will be enforceable against Adobe unless Adobe gives its
+ express consent in writing signed by an authorized signatory of
+ Adobe. If any part of this Agreement is found void and unenforceable,
+ it will not affect the validity of the balance of the Agreement,
+ which shall remain valid and enforceable according to its terms.
+
+
The documentations provided with kipi-plugins 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
Modified: kde-extras/kipi-plugins/trunk/debian/kipi-plugins.install
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/kipi-plugins.install 2009-04-11 01:36:25 UTC (rev 14360)
+++ kde-extras/kipi-plugins/trunk/debian/kipi-plugins.install 2009-04-11 01:50:34 UTC (rev 14361)
@@ -1,7 +1 @@
-debian/tmp/usr/share/services/kipiplugin*
-debian/tmp/usr/share/apps/kipi*
-debian/tmp/usr/share/config.kcfg/htmlexportconfig.kcfg
-debian/tmp/usr/share/locale/*
-debian/tmp/usr/lib/kde3/kipiplugin*
-debian/tmp/usr/lib/libkipiplugins.*
-debian/tmp/usr/bin/*
+usr
Modified: kde-extras/kipi-plugins/trunk/debian/rules
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/rules 2009-04-11 01:36:25 UTC (rev 14360)
+++ kde-extras/kipi-plugins/trunk/debian/rules 2009-04-11 01:50:34 UTC (rev 14361)
@@ -1,11 +1,8 @@
#!/usr/bin/make -f
-
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/kde.mk
+include /usr/share/cdbs/1/class/cmake.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
-include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
SF_PROJECT = kipi
Modified: kde-extras/kipi-plugins/trunk/debian/watch
===================================================================
--- kde-extras/kipi-plugins/trunk/debian/watch 2009-04-11 01:36:25 UTC (rev 14360)
+++ kde-extras/kipi-plugins/trunk/debian/watch 2009-04-11 01:50:34 UTC (rev 14361)
@@ -1,5 +1,7 @@
# See uscan(1) for format
version=3
-opts=dversionmangle=s/~/-/ \
+opts=uversionmangle=s/-/~/ \
http://sf.net/kipi/kipi-plugins-(0.1.*)\.tar\.bz2 debian svn-upgrade
+opts=uversionmangle=s/-/~/ \
+ http://digikam3rdparty.free.fr/0.10.x-releases/kipi-plugins-(.*)\.tar\.bz2 debian svn-upgrade
More information about the pkg-kde-commits
mailing list