diff -Nru darktable-1.2.2/debian/changelog darktable-1.2.2/debian/changelog --- darktable-1.2.2/debian/changelog 2013-07-29 02:41:12.000000000 +0200 +++ darktable-1.2.2/debian/changelog 2013-08-20 21:28:06.000000000 +0200 @@ -1,3 +1,10 @@ +darktable (1.2.2-1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Build against libgphoto2-6 (instead of libgphoto2-2) + + -- Mattia Rizzolo Tue, 20 Aug 2013 10:10:58 +0200 + darktable (1.2.2-1) unstable; urgency=low * New upstream "hardware support release" @@ -20,6 +27,12 @@ -- David Bremner Sun, 28 Jul 2013 18:18:54 -0300 +darktable (1.2.1-2ubuntu1) saucy; urgency=low + + * Build against libgphoto2-6. + + -- Martin Pitt Wed, 31 Jul 2013 08:46:33 +0200 + darktable (1.2.1-1) unstable; urgency=low * New upstream bugfix release (Closes: #710207). diff -Nru darktable-1.2.2/debian/control darktable-1.2.2/debian/control --- darktable-1.2.2/debian/control 2013-07-29 02:41:12.000000000 +0200 +++ darktable-1.2.2/debian/control 2013-08-20 21:29:14.000000000 +0200 @@ -7,7 +7,7 @@ liblcms2-dev, libgtk2.0-dev, libglib2.0-dev, libcairo2-dev, libjpeg-dev, libpng-dev, liblensfun-dev, libtiff5-dev, libexiv2-dev, intltool, libglade2-dev, - libsqlite3-dev, libopenexr-dev, libgphoto2-2-dev, + libsqlite3-dev, libopenexr-dev, libgphoto2-6-dev, libcurl4-gnutls-dev|libcurl-dev, libdbus-glib-1-dev, libgnome-keyring-dev, librsvg2-dev, libflickcurl-dev, xsltproc, libsoup2.4-dev, libglu1-mesa-dev, libsdl1.2-dev, libvte-dev, libcolord-dev,