rev 14643 - in kde-extras/kphotoalbum/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Mon May 18 10:56:15 UTC 2009
Author: fabo
Date: 2009-05-18 10:56:15 +0000 (Mon, 18 May 2009)
New Revision: 14643
Added:
kde-extras/kphotoalbum/trunk/debian/patches/
kde-extras/kphotoalbum/trunk/debian/patches/00_kphotoalbum_r967963.diff
kde-extras/kphotoalbum/trunk/debian/patches/series
Modified:
kde-extras/kphotoalbum/trunk/debian/changelog
kde-extras/kphotoalbum/trunk/debian/control
kde-extras/kphotoalbum/trunk/debian/rules
Log:
Upload kphotoalbum 4.0-2
* Add branch pull patch from r967963:
- BUGFIX: The HTML generator did not display the available themes
correctly.
- BUGFIX: Invoke external application for multiple files did not work.
- BUGFIX: build failure on armel architecture.
* Add quilt build dependency and related CDBS include.
Modified: kde-extras/kphotoalbum/trunk/debian/changelog
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/changelog 2009-05-18 10:54:09 UTC (rev 14642)
+++ kde-extras/kphotoalbum/trunk/debian/changelog 2009-05-18 10:56:15 UTC (rev 14643)
@@ -1,6 +1,17 @@
+kphotoalbum (4.0-2) unstable; urgency=low
+
+ * Add branch pull patch from r967963:
+ - BUGFIX: The HTML generator did not display the available themes
+ correctly.
+ - BUGFIX: Invoke external application for multiple files did not work.
+ - BUGFIX: build failure on armel architecture.
+ * Add quilt build dependency and related CDBS include.
+
+ -- Fathi Boudra <fabo at debian.org> Mon, 18 May 2009 12:42:48 +0200
+
kphotoalbum (4.0-1) unstable; urgency=low
- * New upstream release:
+ * New upstream release
- dialog layout code rewrite (Closes: #451330).
- Initial KDE 4 version (Closes: #507235).
Modified: kde-extras/kphotoalbum/trunk/debian/control
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/control 2009-05-18 10:54:09 UTC (rev 14642)
+++ kde-extras/kphotoalbum/trunk/debian/control 2009-05-18 10:56:15 UTC (rev 14643)
@@ -3,7 +3,7 @@
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: cdbs, debhelper (>= 7), cmake, pkg-kde-tools, docbook-to-man,
+Build-Depends: cdbs, debhelper (>= 7), cmake, quilt, pkg-kde-tools, docbook-to-man,
libexiv2-dev (>= 0.18), libjpeg62-dev, libkdcraw7-dev, libkipi6-dev,
libmarble-dev, x11proto-core-dev
Standards-Version: 3.8.1
Added: kde-extras/kphotoalbum/trunk/debian/patches/00_kphotoalbum_r967963.diff
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/00_kphotoalbum_r967963.diff (rev 0)
+++ kde-extras/kphotoalbum/trunk/debian/patches/00_kphotoalbum_r967963.diff 2009-05-18 10:56:15 UTC (rev 14643)
@@ -0,0 +1,320 @@
+--- a/AnnotationDialog/Dialog.cpp
++++ b/AnnotationDialog/Dialog.cpp
+@@ -167,9 +167,6 @@ AnnotationDialog::Dialog::Dialog( QWidge
+
+ loadWindowLayout();
+
+- // If I don't explicit show _dockWindow here, then no windows will show up.
+- _dockWindow->show();
+-
+ setGeometry( Settings::SettingsData::instance()->windowGeometry( Settings::AnnotationDialog ) );
+
+ setupActions();
+@@ -690,14 +687,18 @@ void AnnotationDialog::Dialog::closeEven
+
+ void AnnotationDialog::Dialog::hideTornOfWindows()
+ {
+- Q_FOREACH( QDockWidget* dock, _dockWidgets )
+- dock->hide();
++ Q_FOREACH( QDockWidget* dock, _dockWidgets ) {
++ if ( dock->isFloating() )
++ dock->hide();
++ }
+ }
+
+ void AnnotationDialog::Dialog::showTornOfWindows()
+ {
+- Q_FOREACH (QDockWidget* dock, _dockWidgets )
+- dock->show();
++ Q_FOREACH (QDockWidget* dock, _dockWidgets ) {
++ if ( dock->isFloating() )
++ dock->show();
++ }
+ }
+
+
+@@ -991,7 +992,7 @@ void AnnotationDialog::Dialog::setupActi
+
+ action = _actions->addAction( QString::fromLatin1("annotationdialog-copy-previous"), this, SLOT( slotCopyPrevious() ) );
+ action->setText( i18n("Copy tags from previous image") );
+- action->setShortcut( Qt::CTRL+Qt::Key_Insert );
++ action->setShortcut( Qt::ALT+Qt::Key_Insert );
+
+ action = _actions->addAction( QString::fromLatin1("annotationdialog-rotate-left"), this, SLOT( rotateLeft() ) );
+ action->setText( i18n("Rotate counterclockwise") );
+--- a/AnnotationDialog/ListSelect.cpp
++++ b/AnnotationDialog/ListSelect.cpp
+@@ -182,7 +182,7 @@ void AnnotationDialog::ListSelect::setMo
+ _or->show();
+ _or->setChecked( true );
+ } else {
+- _and->hide();
++ _and->hide();
+ _or->hide();
+ }
+ for ( Q3ListViewItemIterator itemIt( _listView ); *itemIt; ++itemIt )
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,18 @@
++2009-05-13 Jesper K. Pedersen <blackie at kdab.com>
++
++ * Changed default shortcut for copy from previous image in the
++ annotation dialog to Alt+insert, as control+insert was eaten by
++ the line edits, and the shortcut did thus not work when they had
++ the keyboard focus.
++
++ * BUGFIX: The HTML generator did not display the available themes
++ correctly. Thanks to theBro at luukku.com for a patch for this.
++
++2009-05-11 Jesper K. Pedersen <blackie at kdab.com>
++
++ * BUGFIX: Invoke external application for multiple files did not
++ work. Thanks to theBro at luukku.com for a patch for this.
++
+ ====================== KPhotoalbum 4.0 released ===================================
+
+ Previous changes
+--- a/DB/GpsCoordinates.h
++++ b/DB/GpsCoordinates.h
+@@ -22,6 +22,7 @@
+ #include "config-kpa-marble.h"
+ #ifdef HAVE_MARBLE
+ #include <marble/GeoDataCoordinates.h>
++ #include <marble/global.h>
+ #endif
+
+ #ifdef HAVE_MARBLE
+@@ -87,7 +88,15 @@ public:
+ {
+ // Get the coordinates from the given position to our member
+ // variables
++#if MARBLE_VERSION >= 0x000700
++ qreal tmp_longitude = (qreal)_longitude;
++ qreal tmp_latitude = (qreal)_latitude;
++ position.geoCoordinates(tmp_longitude, tmp_latitude, GeoDataCoordinates::Degree);
++ _longitude = tmp_longitude;
++ _latitude = tmp_latitude;
++#else
+ position.geoCoordinates(_longitude, _latitude, GeoDataCoordinates::Degree);
++#endif
+
+ Q_ASSERT(!this->isNull());
+ }
+--- /dev/null
++++ b/.emacs-dirvars
+@@ -0,0 +1,2 @@
++kdab-jump-project-name: kpa
++kdab-jump-mini-buffer-text-for-orig-version: "###-OLD-OLD-OLD-###"
+--- a/HTMLGenerator/HTMLDialog.cpp
++++ b/HTMLGenerator/HTMLDialog.cpp
+@@ -372,7 +372,8 @@ void HTMLDialog::populateThemesCombo()
+ if(*it == QString::fromLatin1(".") || *it == QString::fromLatin1("..")) continue;
+ QString themePath = QString::fromLatin1("%1/%2/").arg(dir.path()).arg(*it);
+
+- KConfigGroup config = KGlobal::config()->group( QString::fromLatin1( "theme/%1" ).arg( themePath ) );
++ KConfig themeconfig( QString::fromLatin1( "%1/kphotoalbum.theme").arg( themePath ), KConfig::SimpleConfig );
++ KConfigGroup config = themeconfig.group("theme");
+ QString themeName = config.readEntry( "Name" );
+ QString themeAuthor = config.readEntry( "Author" );
+
+--- a/INSTALL
++++ b/INSTALL
+@@ -1,70 +1,2 @@
+-A number of binary packages of KPhotoAlbum is available from the home page at
+-http://www.kphotoalbum.org. You may want to have a look there before
+-proceeding compiling the sources yourself.
+-
+-========== prerequisites ==========
+-
+-KPhotoAlbum supports different features which are realized using
+-external packages. All those packages are not strictly needed -
+-KPhotoAlbum can be build and will run without them, but the
+-corresponding features depend on them.
+-
+-= "kipi" Plug-ins Support
+-You may among other things find plug-ins for:
+-- Writing images to cds or dvd's
+-- Adjusting timestamps on your images
+-- Making a calendar with your images in it
+-- Uploading your images to flickr
+-The plug-in library is called KIPI, and may be downloaded from the
+-KIPI Home page (http://extragear.kde.org/apps/kipi)
+-
+-= EXIF support
+-Images store information like date image was shot, angle it was shot
+-with, focal length, and shutter time in what is know as EXIF
+-information.
+-
+-KPhotoAlbum uses the EXIV2 library (http://freshmeat.net/projects/exiv2)
+-for reading EXIF information from images.
+-
+-= SQL Database Support
+-KPhotoAlbum allows you to search using a certain number of EXIF
+-tags. For this KPhotoAlbum needs a Sqlite database. Unfortunately, for
+-this to work, you need to run Sqlite version 2.8.16, so please make
+-sure that the right version is installed on your system.
+-(you can get it from http://www.sqlite.org/sqlite-2.8.16.tar.gz)
+-You can use CPPFLAGS and LDFLAGS to direct configure to an alternative
+-place for this version of sqlite
+-e.g.
+-> export CPPFLAGS="-I/.../sqlite2.8.16/include"
+-> export LDFLAGS="-L/.../sqlite/2.8.16/lib"
+-> ./configure ....
+-
+-In addition the qt package for sqlite (e.g.qt-sql-sqlite) must be
+-installed.
+-
+-========== Installation: ==========
+-
+-To install KPhotoAlbum into your normal KDE setup, simply run
+-./configure
+-make
+-make install
+-
+-If you want KPhotoAlbum placed in a different directories take the following
+-steps. Below I assume /opt/KPhotoAlbum for your instalation direction, replace
+-with your preference.
+-
+-./configure --prefix=/opt/KPhotoAlbum
+-make
+-make install
+-
+-Next modify your ~/.bashrc, ~/.zshrc, or whatever to include this line:
+-export KDEDIRS=/opt/KPhotoAlbum:$KDEDIRS
+-
+-You can check the status of the different features using
+-KPhotoAlbum Feature Status from the Help menu when running KPhotoAlbum.
+-
+-
+-In case of problems, please refer to the README file for further instructions.
+-
+-Kind Regards
+-Jesper Pedersen <blackie at kde.org>
++Please refer to http://www.kphotoalbum.org/download-source.html for a
++description on how to compile KPhotoAlbum and its dependencies.
+--- a/main.cpp
++++ b/main.cpp
+@@ -35,7 +35,7 @@
+ extern QTemporaryFile* _tmpFileForThumbnailView;
+
+ int main( int argc, char** argv ) {
+- KAboutData aboutData( "kphotoalbum", 0, ki18n("KPhotoAlbum"), "4.0",
++ KAboutData aboutData( "kphotoalbum", 0, ki18n("KPhotoAlbum"), "SVN",
+ ki18n("KDE Photo Album"), KAboutData::License_GPL,
+ KLocalizedString(), KLocalizedString(), "http://www.kphotoalbum.org");
+ aboutData.addAuthor( ki18n("Jesper K. Pedersen"), ki18n("Development"), "blackie at kde.org" );
+--- a/MainWindow/ExternalPopup.cpp
++++ b/MainWindow/ExternalPopup.cpp
+@@ -81,7 +81,7 @@ void MainWindow::ExternalPopup::slotExec
+ Q_ASSERT( offers.count() >= 1 );
+ KService::Ptr ptr = offers.first();
+ KUrl::List lst;
+- if ( action->data() == 2 ) {
++ if ( action->data() == 1 ) {
+ for( QStringList::Iterator it = _list.begin(); it != _list.end(); ++it ) {
+ if ( _appToMimeTypeMap[name].contains( mimeType(*it) ) )
+ lst.append( KUrl(*it) );
+--- a/MainWindow/WelcomeDialog.cpp
++++ b/MainWindow/WelcomeDialog.cpp
+@@ -90,7 +90,8 @@ void WelComeDialog::createSetup()
+ {
+ FileDialog dialog( this );
+ _configFile = dialog.getFileName();
+- accept();
++ if ( !_configFile.isNull() )
++ accept();
+ }
+
+ QString WelComeDialog::configFileName() const
+@@ -98,38 +99,34 @@ QString WelComeDialog::configFileName()
+ return _configFile;
+ }
+
+-FileDialog::FileDialog( QWidget* parent ) :QDialog( parent )
++FileDialog::FileDialog( QWidget* parent ) :KDialog( parent )
+ {
+- QVBoxLayout* lay1 = new QVBoxLayout( this );
++ setButtons( Cancel | Ok );
++
++ QWidget* top = new QWidget;
++ QVBoxLayout* lay1 = new QVBoxLayout( top );
++ setMainWidget( top );
++
+ QLabel* label = new QLabel( i18n("<p>KPhotoAlbum requires that all your images and videos are stored with a common root directory. "
+ "You are allowed to store your images in a directory tree under this directory. "
+ "KPhotoAlbum will not modify or edit any of your images, so you can simply point KPhotoAlbum to the "
+- "directory where you already have all your images located.</p>" ), this );
++ "directory where you already have all your images located.</p>" ), top );
+ label->setWordWrap( true );
+ lay1->addWidget( label );
+
+ QHBoxLayout* lay2 = new QHBoxLayout;
+ lay1->addLayout( lay2 );
+- label = new QLabel( i18n("Image/Video root directory: "), this );
++ label = new QLabel( i18n("Image/Video root directory: "), top );
+ lay2->addWidget( label );
+
+- _lineEdit = new KLineEdit( this );
++ _lineEdit = new KLineEdit( top );
+ _lineEdit->setText( QString::fromLatin1( "~/Images" ) );
+ lay2->addWidget( _lineEdit );
+
+- QPushButton* button = new QPushButton( QString::fromLatin1("..."), this );
++ QPushButton* button = new QPushButton( QString::fromLatin1("..."), top );
+ button->setMaximumWidth( 20 );
+ lay2->addWidget( button );
+- connect( button, SIGNAL( clicked() ), this, SLOT( slotBrowseForDirecory() ) );
+-
+- QHBoxLayout* lay3 = new QHBoxLayout;
+- lay1->addLayout( lay3 );
+- lay3->addStretch( 1 );
+- button = new QPushButton( i18n("&OK"), this );
+- button->setDefault(true);
+- lay3->addWidget( button );
+-
+- connect( button, SIGNAL( clicked() ), this, SLOT( accept() ) );
++ connect( button, SIGNAL( clicked() ), top, SLOT( slotBrowseForDirecory() ) );
+ }
+
+ void FileDialog::slotBrowseForDirecory()
+@@ -144,7 +141,9 @@ QString FileDialog::getFileName()
+ bool ok = false;
+ QString dir;
+ while ( !ok ) {
+- exec();
++ if ( exec() == Rejected )
++ return QString();
++
+ dir = KShell::tildeExpand( _lineEdit->text() );
+ if ( !QFileInfo( dir ).exists() ) {
+ int create = KMessageBox::questionYesNo( this, i18n("Directory does not exists, should I create it?") );
+--- a/MainWindow/WelcomeDialog.h
++++ b/MainWindow/WelcomeDialog.h
+@@ -19,6 +19,7 @@
+ #ifndef WELCOMEDIALOG_H
+ #define WELCOMEDIALOG_H
+
++#include <kdialog.h>
+ #include <qdialog.h>
+ class QLineEdit;
+
+@@ -43,7 +44,7 @@ private:
+ };
+
+
+-class FileDialog : public QDialog
++class FileDialog : public KDialog
+ {
+ Q_OBJECT
+ public:
+--- a/README
++++ b/README
+@@ -15,7 +15,7 @@ Mailing List
+
+ KPhotoAlbum has a mailing list at
+
+- http://klaralvdalens-datakonsult.se/mailman/listinfo/KPhotoAlbum
++ http://www.kdab.net/mailman/listinfo/KPhotoAlbum
+
+ where you might find answers to common questions, plus get information
+ about KPhotoAlbum development, plus of course ask questions.
Added: kde-extras/kphotoalbum/trunk/debian/patches/series
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/patches/series (rev 0)
+++ kde-extras/kphotoalbum/trunk/debian/patches/series 2009-05-18 10:56:15 UTC (rev 14643)
@@ -0,0 +1 @@
+00_kphotoalbum_r967963.diff
Modified: kde-extras/kphotoalbum/trunk/debian/rules
===================================================================
--- kde-extras/kphotoalbum/trunk/debian/rules 2009-05-18 10:54:09 UTC (rev 14642)
+++ kde-extras/kphotoalbum/trunk/debian/rules 2009-05-18 10:56:15 UTC (rev 14643)
@@ -4,6 +4,7 @@
include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
DEB_INSTALL_MANPAGES_kphotoalbum := kphotoalbum.1
More information about the pkg-kde-commits
mailing list