diff -u gtkam-0.1.17/debian/control gtkam-0.1.17/debian/control
--- gtkam-0.1.17/debian/control
+++ gtkam-0.1.17/debian/control
@@ -1,8 +1,9 @@
 Source: gtkam
 Section: graphics
 Priority: extra
-Maintainer: James Vega <jamessan@debian.org>
-Build-Depends: debhelper (>> 5.0.0), libgtk2.0-dev, libgphoto2-2-dev, libgimp2.0-dev, libexif-gtk-dev, libexif-dev, libxml-parser-perl, scrollkeeper, quilt
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: James Vega <jamessan@debian.org>
+Build-Depends: debhelper (>> 5.0.0), libgtk2.0-dev, libgphoto2-2-dev, libgimp2.0-dev, libexif-gtk-dev, libexif-dev, libxml-parser-perl, scrollkeeper, pkg-config, libusb-dev, quilt
 Standards-Version: 3.8.4.0
 Homepage: http://www.gphoto.org/proj/gtkam/
 Vcs-Git: git://git.debian.org/git/collab-maint/gtkam.git
diff -u gtkam-0.1.17/debian/changelog gtkam-0.1.17/debian/changelog
--- gtkam-0.1.17/debian/changelog
+++ gtkam-0.1.17/debian/changelog
@@ -1,3 +1,15 @@
+gtkam (0.1.17-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: LP: #589207
+     + debian/control:
+      - Build-depend against pkg-config and libusb-dev.
+    + debian/patches/gtkam-ru.diff:
+      - Move omf-install/gtkam-ru.omf under quilt.
+      - Refresh the patch and move it under fixes directory under 
+        debian/patches
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Thu, 03 Jun 2010 17:41:08 +0530
+
 gtkam (0.1.17-1) unstable; urgency=low
 
   * New upstream release.
@@ -13,6 +25,16 @@
 
  -- James Vega <jamessan@debian.org>  Thu, 13 May 2010 19:58:06 -0400
 
+gtkam (0.1.16.1-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #317154
+    + debian/control:
+      - Build-depend against pkg-config and libusb-dev.
+    + debian/patches/gtkam-ru.diff:
+      - Move omf-install/gtkam-ru.omf under quilt.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Wed, 14 Jan 2009 21:49:11 +0530
+
 gtkam (0.1.16.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -35,6 +57,20 @@
 
  -- James Vega <jamessan@debian.org>  Mon, 12 Jan 2009 00:59:32 -0500
 
+gtkam (0.1.16-1ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable, remaining Ubuntu changes:
+    + debian/control:
+      - Build-depend against pkg-config and libusb-dev.
+    + debian/changelog:
+      - gtkam is licensed under GPLv2, adjust common-licenses accordingly.
+    + debian/patches/desktop.diff:
+      - Make sure .desktop file is Freedesktop compliant.
+  * debian/patches/gtkam-ru.diff:
+    - Move omf-install/gtkam-ru.omf under quilt.
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sat, 06 Dec 2008 11:44:58 +0100
+
 gtkam (0.1.16-1) unstable; urgency=low
 
   * QA upload.
@@ -56,6 +92,44 @@
 
  -- Barry deFreese <bdefreese@debian.org>  Thu, 04 Dec 2008 14:20:16 -0500
 
+gtkam (0.1.15-0ubuntu1) intrepid; urgency=low
+
+  * New upstream version (LP: #243543).
+  * Add quilt support.
+  * Add desktop.diff to make desktop file valid 
+  * Fix debian-rules-ignores-make-clean-error lintian warnings.
+  * Fix debian-rules-sets-DH_COMPAT lintian warning.
+  * Update Standards-Version to 3.8.0.
+  * Add Homepage field, removing URL reference from binary stanza.
+  * Add watch file.
+  * debian/copyright: Link to /usr/share/common-licenses/GPL-2.
+
+ -- Paolo Naldini <hattory@ubuntu.com>  Tue, 26 Aug 2008 23:51:48 +0200
+
+gtkam (0.1.14-0ubuntu2) intrepid; urgency=low
+
+  * Update Maintainer field as per DebianMaintainerField spec (LP: #230350).
+
+ -- David Futcher <bobbocanfly@gmail.com>  Sat, 07 Jun 2008 18:26:39 +0100
+
+gtkam (0.1.14-0ubuntu1) feisty; urgency=low
+
+  * New upstream release
+
+ -- Hubert Figuiere <hub@figuiere.net>  Sun, 17 Dec 2006 19:44:20 -0500
+
+gtkam (0.1.13-0ubuntu1) dapper; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - added pkg-config, libusb-dev to Build-Depends.
+    - bumped libgphoto2, debhelper Build-Depends. 
+    - bumped Standards-Version.
+  * debian/rules:
+    - bumped compat.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Sat, 31 Dec 2005 10:04:26 +0100
+
 gtkam (0.1.12-2.4) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u gtkam-0.1.17/debian/patches/series gtkam-0.1.17/debian/patches/series
--- gtkam-0.1.17/debian/patches/series
+++ gtkam-0.1.17/debian/patches/series
@@ -2 +2,3 @@
+fixes/gtkam-ru.diff -p1
 fixes/gerror.diff -p1
+
only in patch2:
unchanged:
--- gtkam-0.1.17.orig/debian/patches/fixes/gtkam-ru.diff
+++ gtkam-0.1.17/debian/patches/fixes/gtkam-ru.diff
@@ -0,0 +1,24 @@
+Index: gtkam-0.1.17/omf-install/gtkam-ru.omf
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gtkam-0.1.17/omf-install/gtkam-ru.omf	2008-12-06 11:18:54.000000000 +0100
+@@ -0,0 +1,19 @@
++<?xml version="1.0" standalone="no"?>
++<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd">
++<omf>
++  <resource>
++    <creator>
++      sdiconov@mail.ru
++    </creator>
++    <title>
++      gtkam
++    </title>
++    <date>
++      2004-06-08
++    </date>
++    <subject category="GNOME|Applications|Graphics"/>
++    <format mime="text/xml"/>
++    <identifier url="file:/usr/share/gnome/help/gtkam/ru/gtkam.xml"/>
++    <language code="ru"/>
++  </resource>
++</omf>