./hildon-thumbnail/ubuntu r19: merge cjwatsons fixes for version 2.0.0-0ubuntu2

[Oliver Grawert]

------------------------------------------------------------
revno: 19
committer: Oliver Grawert <ogra at ubuntu.com>
branch nick: ubuntu
timestamp: Thu 2008-11-27 12:52:20 +0100
message:
  merge cjwatsons fixes for version 2.0.0-0ubuntu2
added:
  debian/patches/tests-unfortify.patch
modified:
  debian/changelog
  debian/control
    ------------------------------------------------------------
    revno: 18.1.1
    committer: Colin Watson <cjwatson at canonical.com>
    branch nick: hildon-thumbnail
    timestamp: Thu 2008-11-27 11:27:22 +0000
    message:
      add Vcs-Bzr field for Ubuntu
    modified:
      debian/control
    ------------------------------------------------------------
    revno: 18.1.2
    committer: Colin Watson <cjwatson at canonical.com>
    branch nick: hildon-thumbnail
    timestamp: Thu 2008-11-27 11:27:31 +0000
    message:
      tests-unfortify.patch: Undefine _FORTIFY_SOURCE while building tests;
      the tests don't have much facility for actually returning failure
      anyway, and we don't install the resulting binary, so it seems
      unnecessary to worry about this here (LP: #300215).
    added:
      debian/patches/tests-unfortify.patch
    modified:
      debian/changelog
    ------------------------------------------------------------
    revno: 18.1.3
    tags: 2.0.0-0ubuntu2
    committer: Colin Watson <cjwatson at canonical.com>
    branch nick: hildon-thumbnail
    timestamp: Thu 2008-11-27 11:29:14 +0000
    message:
      releasing version 2.0.0-0ubuntu2
    modified:
      debian/changelog
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-02-14 03:36:30 +0000
+++ b/debian/changelog	2008-11-27 11:29:14 +0000
@@ -1,3 +1,12 @@
+hildon-thumbnail (2.0.0-0ubuntu2) jaunty; urgency=low
+
+  * tests-unfortify.patch: Undefine _FORTIFY_SOURCE while building tests;
+    the tests don't have much facility for actually returning failure
+    anyway, and we don't install the resulting binary, so it seems
+    unnecessary to worry about this here (LP: #300215).
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Thu, 27 Nov 2008 11:27:51 +0000
+
 hildon-thumbnail (2.0.0-0ubuntu1) hardy; urgency=low
 
   * Repack to have a orig tarball.

=== modified file 'debian/control'
--- a/debian/control	2008-02-14 03:36:30 +0000
+++ b/debian/control	2008-11-27 11:27:22 +0000
@@ -5,6 +5,7 @@
 XSBC-Original-Maintainer: Marius Vollmer <marius.vollmer at nokia.com>
 Build-Depends: debhelper (>= 5.0.0), cdbs, pkg-config, libgnomevfs2-dev, libgtk2.0-dev, gtk-doc-tools, libosso-dev
 Standards-Version: 3.6.0
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-mobile/hildon-thumbnail/ubuntu
 
 Package: hildon-thumbnail
 Section: libs

=== added file 'debian/patches/tests-unfortify.patch'
--- a/debian/patches/tests-unfortify.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/tests-unfortify.patch	2008-11-27 11:27:31 +0000
@@ -0,0 +1,21 @@
+diff -Nur -x '*.orig' -x '*~' hildon-thumbnail/tests/Makefile.am hildon-thumbnail.new/tests/Makefile.am
+--- hildon-thumbnail/tests/Makefile.am	2008-11-27 00:07:56.000000000 +0000
++++ hildon-thumbnail.new/tests/Makefile.am	2008-11-27 00:08:53.000000000 +0000
+@@ -1,4 +1,4 @@
+-INCLUDES = -I$(srcdir)/../thumbs -I$(srcdir)/.. $(PKG_CFLAGS)
++INCLUDES = -I$(srcdir)/../thumbs -I$(srcdir)/.. $(PKG_CFLAGS) -U_FORTIFY_SOURCE
+ 
+ bin_PROGRAMS = hildon-thumbnail-tester
+ 
+diff -Nur -x '*.orig' -x '*~' hildon-thumbnail/tests/Makefile.in hildon-thumbnail.new/tests/Makefile.in
+--- hildon-thumbnail/tests/Makefile.in	2008-11-27 00:08:12.000000000 +0000
++++ hildon-thumbnail.new/tests/Makefile.in	2008-11-27 00:09:07.000000000 +0000
+@@ -188,7 +188,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-INCLUDES = -I$(srcdir)/../thumbs -I$(srcdir)/.. $(PKG_CFLAGS)
++INCLUDES = -I$(srcdir)/../thumbs -I$(srcdir)/.. $(PKG_CFLAGS) -U_FORTIFY_SOURCE
+ hildon_thumbnail_tester_SOURCES = tests.c
+ hildon_thumbnail_tester_LDADD = $(top_builddir)/thumbs/libhildonthumbnail.la $(PKG_LIBS)
+ EXTRA_DIST = $(wildcard $(srcdir)/images/*)