← Back to branch summary

~ubuntu-branches/ubuntu/vivid/digikam/vivid

« back to all changes in this revision

Viewing changes to extra/libkdcraw/libkdcraw/kdcraw.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-02-14 19:29:29 UTC
  • mfrom: (1.2.38) (3.1.16 experimental)
  • Revision ID: package-import@ubuntu.com-20120214192929-cx2zia3b2nt67lvz
Tags: 4:2.5.0-1ubuntu1
* Merge from debian unstable, remaining changes:
  - keep seperate binary packages:
    + libkface1, libkface-data, libkface-dev
    + libkgeomap1, libkgeomap-data, libkgeomap-dev
    + libvkontakte1, libkvkontakte-dev
    + libmediawiki1, libmediawiki-dev
  - keep patches:
    + kubuntu_mysqld_executable_name.diff
  - don't fail on missing files in dh_install
  - install oxygen icons for kipi-plugins
  - build-depend on mysql 5.5 instead of 5.1
  - update install files
* digikam breaks/replaces kipi-plugins-common << 4:2.5.0~
* digikam-doc breaks/replaces digikam-data << 4:2.5.0~
* digikam-data breaks/replaces kipi-plugins << 4:2.5.0~
* kipi-plugins-common breaks/replaces kipi-plugins << 4:2.5.0~

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/libkdcraw/libkdcraw/kdcraw.cpp
30
30
#include "kdcraw.moc"
31
31
#include "kdcraw_p.h"
32
32
 
33
 
// Qt includes.
 
33
// Qt includes
34
34
 
35
35
#include <QFile>
36
36
#include <QFileInfo>
37
37
#include <QStringList>
38
38
 
39
 
// LibRaw includes.
 
39
// LibRaw includes
40
40
 
41
41
#include "libraw/libraw_version.h"
42
42
 
43
 
// Local includes.
 
43
// Local includes
44
44
 
45
45
#include "version.h"
46
46
#include "rawfiles.h"