Merge lp:~ubuntu-branches/ubuntu/precise/eog/precise-201312091849 into lp:ubuntu/precise/eog

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/eog reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/eog/precise-201312091849. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

127. By Martin Pitt on 2011-11-14

debian/control: Only build dep on libjpeg-dev.

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-17 14:11:53 +0000
+++ debian/changelog	2013-12-09 20:55:43 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 eog (3.4.1-0ubuntu1) precise; urgency=low
 
   * New upstream release:
@@ -17,6 +18,113 @@
   * New upstream version:
     - don't segfault when mouse scrolling though thumnbails (lp: #672312)
   * Resynchronize on Debian, remaining diffs:
+=======
+eog (3.2.1-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/control: Only build dep on libjpeg-dev.
+
+ -- Martin Pitt <[e-mail]>  Mon, 14 Nov 2011 11:59:17 +0100
+
+eog (3.2.1-0ubuntu2) precise; urgency=low
+
+  * debian/control.in: libjpeg62-dev → libjpeg8-dev.
+
+ -- Martin Pitt <[e-mail]>  Mon, 14 Nov 2011 09:15:32 +0100
+
+eog (3.2.1-0ubuntu1) oneiric-proposed; urgency=low
+
+  [ Chase Douglas ]
+  * Update Bzr-Vcs tag to point to ~ubuntu-desktop instead of ~gnome3-team
+
+  [ Didier Roche ]
+  * New upstream release (LP: #877186)
+    - new and updated translations
+
+ -- Didier Roche <[e-mail]>  Tue, 18 Oct 2011 09:48:34 +0200
+
+eog (3.2.0-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release: Translation updates only.
+  * Refresh patches to apply cleanly.
+
+ -- Martin Pitt <[e-mail]>  Tue, 27 Sep 2011 07:13:37 +0200
+
+eog (3.1.92-0ubuntu2) oneiric; urgency=low
+
+  * Fix rotation gesture direction (LP: #848799)
+
+ -- Chase Douglas <[e-mail]>  Fri, 23 Sep 2011 11:06:08 -0700
+
+eog (3.1.92-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release
+
+ -- Rodrigo Moya <[e-mail]>  Tue, 20 Sep 2011 10:48:32 +0200
+
+eog (3.1.91-0ubuntu1) oneiric; urgency=low
+
+  * New upstream version
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 06 Sep 2011 15:40:48 +0200
+
+eog (3.1.90-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release
+
+ -- Rodrigo Moya <[e-mail]>  Mon, 05 Sep 2011 10:19:55 +0200
+
+eog (3.1.5-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release
+
+ -- Rodrigo Moya <[e-mail]>  Tue, 16 Aug 2011 12:11:41 +0200
+
+eog (3.1.4-0ubuntu2) oneiric; urgency=low
+
+  * Added libgrip gesture support (LP: #823640)
+    - added debian/patches/02_grip_gestures.patch
+    - adds pinch-to-zoom, rotate, and drag gestures
+    - adds build-depends on libgrip-dev
+
+ -- Stephen M. Webb <[e-mail]>  Wed, 10 Aug 2011 10:10:37 -0400
+
+eog (3.1.4-0ubuntu1) oneiric; urgency=low
+
+  * New upsteam release:
+    - if saving an image fails it's done silently (LP: #673299)
+  * debian/control:
+    - set Vcs-Bzr to the ubuntu-desktop team, no gnome3-team
+
+ -- Didier Roche <[e-mail]>  Tue, 26 Jul 2011 15:28:21 +0200
+
+eog (3.1.2-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release
+  * debian/watch:
+    - Watch unstable versions
+  * debian/eog.install:
+    - Remove installation of non-existing directories
+
+ -- Rodrigo Moya <[e-mail]>  Fri, 01 Jul 2011 11:31:40 +0200
+
+eog (3.0.2-1ubuntu3) oneiric; urgency=low
+
+  * No-change rebuild against libgnome-desktop-3-2
+
+ -- Steve Langasek <[e-mail]>  Sat, 25 Jun 2011 09:26:44 -0700
+
+eog (3.0.2-1ubuntu2) oneiric; urgency=low
+
+  * debian/eog.gsettings-override, debian/eog.install: 
+    - use correct naming so it's handled by dh_installgsettings
+
+ -- Sebastien Bacher <[e-mail]>  Mon, 06 Jun 2011 17:36:34 +0200
+
+eog (3.0.2-1ubuntu1) oneiric; urgency=low
+
+  * Resynchronize on Debian
+  * Remaing diff:
+>>>>>>> MERGE-SOURCE
   * debian/control.in:
     - Build-Depends on dh-autoreconf, liblaunchpad-integration-3.0-dev, 
       libgrip-dev
 
=== modified file 'debian/control'
=== modified file 'debian/control.in'