* New upstream release.

  - Optimization flags are not overridden during build anymore
    (Closes: #642177)
* debian/control.in:
  - Bump Standards-Version to 3.9.4 (no further changes)
  - Add autotools-dev and libglib2.0-dev to the build-dependencies
* debian/patches/fix_format.patch: Fix FTBFS when compiled with
  -Werror=format-security flag
* debian/patches/link_gmodule.patch: Explicitly link against libgmodule,
  libseed is using some of its symbols

7 files changed, 69 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 5f7ef6c..97ab34d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,20 @@
-seed (3.2.0-3) UNRELEASED; urgency=low
+seed (3.8.1-1) UNRELEASED; urgency=low
 
+  [ Jeremy Bicha ]
   * Update homepage
 
+  [ Laurent Bigonville ]
+  * New upstream release.
+    - Optimization flags are not overridden during build anymore
+      (Closes: #642177)
+  * debian/control.in:
+    - Bump Standards-Version to 3.9.4 (no further changes)
+    - Add autotools-dev and libglib2.0-dev to the build-dependencies
+  * debian/patches/fix_format.patch: Fix FTBFS when compiled with
+    -Werror=format-security flag
+  * debian/patches/link_gmodule.patch: Explicitly link against libgmodule,
+    libseed is using some of its symbols
+
  -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 28 Jun 2013 18:38:03 -0400
 
 seed (3.2.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 5a158df..c66beae 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 8),
                cdbs (>= 0.4.4),
+               autotools-dev,
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
                libffi-dev (>= 3.0),
@@ -17,6 +18,7 @@ Build-Depends: debhelper (>= 8),
                gir1.2-glib-2.0,
                gnome-js-common,
                libcairo2-dev,
+               libglib2.0-dev,
                libgtk2.0-dev (>= 2.24.0),
                libgtk-3-dev (>= 3.0.0),
                libreadline-dev,
@@ -26,8 +28,8 @@ Build-Depends: debhelper (>= 8),
                libxml2-dev,
                libmpfr-dev,
                gtk-doc-tools (>= 1.9)
-Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Frederic Peters <fpeters@debian.org>, Gustavo Noronha Silva <kov@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
-Standards-Version: 3.9.2
+Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Frederic Peters <fpeters@debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Josselin Mouette <joss@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/seed
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/seed
 Homepage: https://wiki.gnome.org/Seed
diff --git a/debian/control.in b/debian/control.in
index 83ec622..fbc2154 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,6 +4,8 @@ Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 8),
                cdbs (>= 0.4.4),
+               autotools-dev,
+               dh-autoreconf,
                gnome-pkg-tools (>= 0.10),
                intltool (>= 0.35.0),
                libffi-dev (>= 3.0),
@@ -12,6 +14,7 @@ Build-Depends: debhelper (>= 8),
                gir1.2-glib-2.0,
                gnome-js-common,
                libcairo2-dev,
+               libglib2.0-dev,
                libgtk2.0-dev (>= 2.24.0),
                libgtk-3-dev (>= 3.0.0),
                libreadline-dev,
@@ -22,7 +25,7 @@ Build-Depends: debhelper (>= 8),
                libmpfr-dev,
                gtk-doc-tools (>= 1.9)
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/seed
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/seed
 Homepage: https://wiki.gnome.org/Seed
diff --git a/debian/patches/fix_format.patch b/debian/patches/fix_format.patch
new file mode 100644
index 0000000..aa009a4
--- /dev/null
+++ b/debian/patches/fix_format.patch
@@ -0,0 +1,18 @@
+Description: Fix FTBFS when compiled -Werror=format-security flag
+Author: Laurent Bigonville <bigon@debian.org>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=710658
+
+--- a/libseed/seed-types.c
++++ b/libseed/seed-types.c
+@@ -1211,10 +1211,8 @@ seed_value_from_gi_argument_full (JSCont
+         if ((key_type_tag != GI_TYPE_TAG_UTF8) &&
+             (key_type_tag != GI_TYPE_TAG_FILENAME))
+           {
+-            char *error_message = g_strdup_printf ("Unable to make object from hash table indexed with values of type %s", g_type_tag_to_string (key_type_tag));
+             seed_make_exception (ctx, exception, "ArgumentError",
+-                                 error_message);
+-            g_free (error_message);
++                                 "Unable to make object from hash table indexed with values of type %s", g_type_tag_to_string (key_type_tag));
+             return JSValueMakeNull (ctx);
+           }
+ 
diff --git a/debian/patches/link_gmodule.patch b/debian/patches/link_gmodule.patch
new file mode 100644
index 0000000..6d41dee
--- /dev/null
+++ b/debian/patches/link_gmodule.patch
@@ -0,0 +1,26 @@
+Description: Explicitly link against libgmodule-2.0
+Author: Laurent Bigonville <bigon@debian.org>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=710670
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -128,6 +128,9 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
+ dnl ========================GIO================================================
+ PKG_CHECK_MODULES(GIO, gio-2.0)
+ 
++dnl ========================GModule================================================
++PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0)
++
+ dnl =============================Modules=======================================
+ dnl ==== canvas ====
+ AC_ARG_ENABLE(canvas-module,
+--- a/libseed/Makefile.am
++++ b/libseed/Makefile.am
+@@ -44,6 +44,7 @@ libseed@SEED_GTK_VERSION@_la_LIBADD = \
+ 	$(SEED_PROFILE_LIBS) \
+ 	$(SEED_OSX_LIBS) \
+ 	$(GIO_LIBS) \
++	$(GMODULE_LIBS) \
+ 	$(FFI_LIBS) -ldl
+ 
+ seedheaders_HEADERS = seed.h seed-debug.h seed-module.h
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..c70b315 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix_format.patch
+link_gmodule.patch
diff --git a/debian/rules b/debian/rules
index 9020853..ee1bb9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_COMPRESS_EXCLUDE += js ui