-
Committer:
Bazaar Package Importer
-
Author(s):
Alessandro Ghersi
-
Date:
2010-06-18 21:58:46 UTC
-
mfrom:
(1.2.29 upstream)
(3.2.13 sid)
-
Revision ID:
james.westby@ubuntu.com-20100618215846-c95bk5aoysmu786d
Tags: 2:1.3.0-0ubuntu1
* Merge with Debian unstable, remaining changes:
  - Export .pot name and copy to plugins in debian/rules
  - Enable Nepomuk support in Digikam
    - Add shared-desktop-ontologies to build depends
* New upstream release:
  - Remove digikam-1.2.0-kde232628.patch fixed by upstream
  - Add mysql-server-5.1 to buil-depends