diff options
| author | Laurent Bigonville <bigon@debian.org> | 2013-10-23 16:14:36 +0000 |
|---|---|---|
| committer | Andrew Shadura <andrew.shadura@collabora.co.uk> | 2016-09-20 10:28:24 +0200 |
| commit | 1dc3fa6d386fed06a0b429790b417fcf90077932 (patch) | |
| tree | 02d1002139c3664e6d0f12b697712278d3c47c61 | |
| parent | 9afbb208d9b49391550e422b3c0305d52b59be70 (diff) | |
- Add autotools-dev, dh-autoreconf and libglib2.0-dev to the
build-dependencies
* debian/rules: Call dh_autoreconf during build
* debian/patches/fix_autogen_and_configure.patch: Prevent possible FTBFS due
to changes in gnome-common
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/patches/fix_autogen_and_configure.patch | 21 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 28 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 97ab34d..45f9a16 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,11 +9,15 @@ seed (3.8.1-1) UNRELEASED; urgency=low (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 + - Add autotools-dev, dh-autoreconf 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 + * debian/rules: Call dh_autoreconf during build + * debian/patches/fix_autogen_and_configure.patch: Prevent possible FTBFS due + to changes in gnome-common -- Jeremy Bicha <jbicha@ubuntu.com> Fri, 28 Jun 2013 18:38:03 -0400 diff --git a/debian/control b/debian/control index c66beae..1c40dfe 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian. 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), diff --git a/debian/patches/fix_autogen_and_configure.patch b/debian/patches/fix_autogen_and_configure.patch new file mode 100644 index 0000000..393c88e --- /dev/null +++ b/debian/patches/fix_autogen_and_configure.patch @@ -0,0 +1,21 @@ +From 24c5968e2ae3bdc49811329fa722035dba76db01 Mon Sep 17 00:00:00 2001 +From: Seán de Búrca <leftmostcat@gmail.com> +Date: Mon, 26 Aug 2013 21:16:45 +0000 +Subject: Fix autogen and configure + +https://bugzilla.gnome.org/show_bug.cgi?id=706833 +--- +diff --git a/configure.ac b/configure.ac +index f741f24..ddcab40 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,6 +4,7 @@ AC_INIT(seed, 3.8.2) + AM_INIT_AUTOMAKE([1.7 -Wno-portability]) + AM_MAINTAINER_MODE([enable]) + AC_CONFIG_HEADERS([config.h]) ++AC_CONFIG_MACRO_DIR([m4]) + + AC_CANONICAL_HOST + +-- +cgit v0.9.2 diff --git a/debian/patches/series b/debian/patches/series index c70b315..2f829c7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ fix_format.patch link_gmodule.patch +fix_autogen_and_configure.patch |