Re: x11-apps: Changes to 'debian-unstable'
On Thu, Apr 14, 2011 at 11:05:59 +0000, Julien Viard de Galbert wrote:
> diff --git a/debian/patches/oclock-ftbfs.diff b/debian/patches/oclock-ftbfs.diff
> new file mode 100644
> index 0000000..edc8b7d
> --- /dev/null
> +++ b/debian/patches/oclock-ftbfs.diff
> @@ -0,0 +1,57 @@
> +diff --git a/oclock/configure b/oclock/configure
> +index e3f9cc5..9ad7c3a 100755
> +--- a/oclock/configure
> ++++ b/oclock/configure
> +@@ -4603,11 +4603,11 @@ if test -n "$OCLOCK_CFLAGS"; then
> + elif test -n "$PKG_CONFIG"; then
> + if test -n "$PKG_CONFIG" && \
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xmu xext\""; } >&5
> +- ($PKG_CONFIG --exists --print-errors "x11 xmu xext") 2>&5
> ++ ($PKG_CONFIG --exists --print-errors "x11 xmu xext xt") 2>&5
> + ac_status=$?
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> +- pkg_cv_OCLOCK_CFLAGS=`$PKG_CONFIG --cflags "x11 xmu xext" 2>/dev/null`
> ++ pkg_cv_OCLOCK_CFLAGS=`$PKG_CONFIG --cflags "x11 xmu xext xt" 2>/dev/null`
> + else
> + pkg_failed=yes
> + fi
> +@@ -4619,11 +4619,11 @@ if test -n "$OCLOCK_LIBS"; then
> + elif test -n "$PKG_CONFIG"; then
> + if test -n "$PKG_CONFIG" && \
> + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xmu xext\""; } >&5
> +- ($PKG_CONFIG --exists --print-errors "x11 xmu xext") 2>&5
> ++ ($PKG_CONFIG --exists --print-errors "x11 xmu xext xt") 2>&5
> + ac_status=$?
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; then
> +- pkg_cv_OCLOCK_LIBS=`$PKG_CONFIG --libs "x11 xmu xext" 2>/dev/null`
> ++ pkg_cv_OCLOCK_LIBS=`$PKG_CONFIG --libs "x11 xmu xext xt" 2>/dev/null`
> + else
> + pkg_failed=yes
> + fi
> +@@ -4641,9 +4641,9 @@ else
> + _pkg_short_errors_supported=no
> + fi
> + if test $_pkg_short_errors_supported = yes; then
> +- OCLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xmu xext" 2>&1`
> ++ OCLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xmu xext xt" 2>&1`
> + else
> +- OCLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xmu xext" 2>&1`
> ++ OCLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xmu xext xt" 2>&1`
> + fi
> + # Put the nasty error message in config.log where it belongs
> + echo "$OCLOCK_PKG_ERRORS" >&5
Please don't include generated files in quilt patches. Either patch
directly or run the scripts on package build.
Cheers,
Julien
Reply to: