[Pkg-cli-apps-commits] [f-spot] 01/01: Imported Debian patch 0.8.2-5.1

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch master
in repository f-spot.

commit 6fb107d74e77d046abfda678ef0d04df8d08dec5
Author: Hideki Yamane <henrich at debian.org>
Date:   Sun Oct 6 15:23:06 2013 +0900

    Imported Debian patch 0.8.2-5.1
---
 debian/changelog                                        |    9 +++++++++
 .../0004-Fix-build-error-with-recent_gtk-sharp.patch    |   15 +++++++++++++++
 debian/patches/series                                   |    1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 003f792..f649a89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+f-spot (0.8.2-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches
+    - cherry-pick as 0004-Fix-build-error-with-recent_gtk-sharp.patch
+     (Closes: #713104)
+
+ -- Hideki Yamane <henrich at debian.org>  Sun, 06 Oct 2013 15:23:06 +0900
+
 f-spot (0.8.2-5) unstable; urgency=low
 
   * No-change rebuild for Mono 2.10 transition
diff --git a/debian/ltmain.sh b/debian/ltmain.sh
old mode 100755
new mode 100644
diff --git a/debian/patches/0004-Fix-build-error-with-recent_gtk-sharp.patch b/debian/patches/0004-Fix-build-error-with-recent_gtk-sharp.patch
new file mode 100644
index 0000000..c286967
--- /dev/null
+++ b/debian/patches/0004-Fix-build-error-with-recent_gtk-sharp.patch
@@ -0,0 +1,15 @@
+from upstream git
+
+diff --git a/src/Clients/MainApp/FSpot/GroupSelector.cs b/src/Clients/MainApp/FSpot/GroupSelector.cs
+index b1e4993..63edd84 100644
+--- a/src/Clients/MainApp/FSpot/GroupSelector.cs
++++ b/src/Clients/MainApp/FSpot/GroupSelector.cs
+@@ -467,7 +467,7 @@ namespace FSpot {
+ 				bounds.Height = selector.background.Height;
+ 				bounds.Y = selector.background.Y;
+ 				bounds.X = selector.BoxX (item);
+-				bounds.Width = Math.Max (selector.BoxX (item + 1) - bounds.X, 1);
++				bounds.Width = Math.Max (selector.BoxX (item + 1) - selector.BoxX (item), 1);
+ 
+ 				if (item < 0 || item > selector.box_counts.Length - 1)
+ 					return;
diff --git a/debian/patches/series b/debian/patches/series
index cc5f00c..f745d0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-ubuntu_xdg-photo-dir.patch
 0002-PixbufLoader-from-gtk-sharp-master-does-not-have-a-C.patch
 0003-link-libfspot-with-needed-libm.patch
+0004-Fix-build-error-with-recent_gtk-sharp.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/f-spot.git