~ubuntu-branches/ubuntu/quantal/digikam/quantal-proposed

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2012-06-08 00:31:19 UTC
  • mfrom: (1.2.39) (3.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20120608003119-qn0l1eo3rf5jdh9w
Tags: 4:2.6.0-0ubuntu1
* Merge from debian, remaining changes (LP: #885324, #1009943)
  - 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
  - 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~
* Update install files
Filename Latest Rev Last Changed Committer Comment Size
..
icons 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 Diff
CMakeLists.txt 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 770 bytes Diff Download File
imageshack.cpp 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 2.5 KB Diff Download File
imageshack.h 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 1.7 KB Diff Download File
imageshackitem.h 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 1.2 KB Diff Download File
imageshacktalker.cpp 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 10.1 KB Diff Download File
imageshacktalker.h 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 2.7 KB Diff Download File
imageshackwidget.cpp 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 10.7 KB Diff Download File
imageshackwidget.h 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 2.6 KB Diff Download File
imageshackwindow.cpp 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 12.9 KB Diff Download File
imageshackwindow.h 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 2.5 KB Diff Download File
kipiplugin_imageshackexport.desktop 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 2.2 KB Diff Download File
mpform.cpp 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 3.1 KB Diff Download File
mpform.h 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 1.4 KB Diff Download File
plugin_imageshackexport.cpp 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 3 KB Diff Download File
plugin_imageshackexport.h 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 1.5 KB Diff Download File
README 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 96 bytes Diff Download File
TODO 81 12 years ago Package Import Robot * Merge from debian, remaining changes (LP: #88532 20 bytes Diff Download File