x11-apps: Changes to 'debian-unstable'
debian/control | 5 ++-
debian/patches/oclock-ftbfs.diff | 57 +++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 61 insertions(+), 2 deletions(-)
New commits:
commit b4b88500a8f655004da76ff546f6507b3b0998bb
Author: Julien Viard de Galbert <julien@vdg.blogsite.org>
Date: Thu Apr 14 11:24:12 2011 +0200
Updating package description & recommends (#550308)
diff --git a/debian/control b/debian/control
index 305a1c4..5b67811 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-apps.git
Package: x11-apps
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cpp
+Recommends: xbitmap
Suggests: mesa-utils
Conflicts: bitmap, oclock, x11perf, xbiff, xcalc, xclipboard, xclock, xconsole,
xcursorgen, xditview, xeyes, xgc, xload, xlogo, xmag, xman, xmore, xwd,
@@ -74,5 +75,5 @@ Description: X applications
- Xmark, x11perf, and x11perfcomp, tools for benchmarking graphical
operations under the X Window System;
.
- The xbiff, xcalc, xconsole and xman programs use bitmap images provided
- by the xbitmaps package.
+ The xbiff, xcalc, xconsole, xedit and xman programs use bitmap images
+ provided by the xbitmaps package.
commit 9f51dfb6b75f3e948fb8c1d7145787846406cac7
Author: Julien Viard de Galbert <julien@vdg.blogsite.org>
Date: Thu Apr 14 11:16:30 2011 +0200
Fix oclock build
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
+diff --git a/oclock/configure.ac b/oclock/configure.ac
+index ab542a7..df176d8 100644
+--- a/oclock/configure.ac
++++ b/oclock/configure.ac
+@@ -38,7 +38,7 @@ XORG_DEFAULT_OPTIONS
+ AM_CONFIG_HEADER(config.h)
+
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(OCLOCK, x11 xmu xext)
++PKG_CHECK_MODULES(OCLOCK, x11 xmu xext xt)
+
+ PKG_CHECK_MODULES(APPDEFS, xt)
+ xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..0010293 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+oclock-ftbfs.diff
Reply to: