lp:~noskcaj/ubuntu/trusty/darktable/merge

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:ubuntu/trusty/darktable

Logan Rosen (community): Needs Fixing on 2014-01-27

Ubuntu branches: Pending requested 2014-01-26

Diff: 159137 lines (+1200/-155280)

36 files modified

.pc/.quilt_patches (+0/-1)
.pc/.quilt_series (+0/-1)
.pc/.version (+0/-1)
.pc/applied-patches (+0/-1)
.pc/upstream_translations.patch/po/da.po (+0/-8593)
.pc/upstream_translations.patch/po/de.po (+0/-9579)
.pc/upstream_translations.patch/po/es.po (+0/-10129)
.pc/upstream_translations.patch/po/fr.po (+0/-9516)
.pc/upstream_translations.patch/po/it.po (+0/-9658)
.pc/upstream_translations.patch/po/ja.po (+0/-9126)
.pc/upstream_translations.patch/po/nl.po (+0/-9522)
.pc/upstream_translations.patch/po/pl.po (+0/-9781)
.pc/upstream_translations.patch/po/pt_BR.po (+0/-8488)
.pc/upstream_translations.patch/po/pt_PT.po (+0/-8817)
.pc/upstream_translations.patch/po/ru.po (+0/-9768)
.pc/upstream_translations.patch/po/sq.po (+0/-8313)
.pc/upstream_translations.patch/po/sv.po (+0/-10001)
.pc/upstream_translations.patch/po/uk.po (+0/-9010)
debian/changelog (+14/-0)
debian/control (+1/-1)
debian/patches/series (+1/-2)
debian/patches/upstream_translations.patch (+0/-14417)
po/da.po (+0/-622)
po/de.po (+42/-677)
po/es.po (+6/-679)
po/fr.po (+6/-800)
po/it.po (+0/-600)
po/ja.po (+0/-733)
po/nl.po (+0/-747)
po/pl.po (+0/-625)
po/pt_BR.po (+0/-571)
po/pt_PT.po (+12/-608)
po/ru.po (+6/-633)
po/sq.po (+0/-1013)
po/sv.po (+6/-629)
po/uk.po (+1106/-1618)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

29. By Jackson Doak on 2014-01-28

Drop our translation patch, it isn't needed

28. By Jackson Doak on 2014-01-26

add target distro

27. By Jackson Doak on 2014-01-26

* Merge from Debian unstable. Remaining changes:
  - Build against libgphoto2-6

26. By Bhavani Shankar on 2014-01-01

* Merge from Debian unstable. Remaining changes:
  - Build against libgphoto2-6
* Convert upstream translations to a patch to stop debuild complaining.

25. By Jason Gerard DeRose on 2013-09-25

* Merge 1.2.3-1 from Debian unstable/testing (LP: #1231252)
  - Build against libgphoto2-6 (instead of libgphoto2-2)

24. By Bhavani Shankar on 2013-09-07

* Merge from Debian unstable. Remaining changes:
  - Build against libgphoto2-6 (instead of libgphoto2-2)

23. By Mattia Rizzolo on 2013-08-20

* Merge from Debian unstable (LP: #1214557). Remaining changes:
  - Build against libgphoto2-6 (instead of libgphoto2-2)

22. By Martin Pitt on 2013-07-31

Build against libgphoto2-6.

21. By David Bremner on 2013-06-15

Bug fix: "CVE-2013-2126: double free", thanks to Raphael Geissert
(Closes: #711316).

20. By David Bremner on 2013-05-29

* New upstream bugfix release (Closes: #710207).
  - Blend mode "vividlight" should work for NaNs
  - Whitebalance is now relative to daylight, not to camera white balance
  - Now importing folder via key accelerator is supported.
  - Only one temperature slider in white balance
  - Some fixes to the zoom behaviour in darkroom mode
  - Fix some possible deadlocks, memory leaks and null pointer dereferences