Package: xkbsel
Version: 0.13-13
Severity: normal
Tags: patch
Hi,
Attached is the diff for my xkbsel 0.13-13.1 NMU.
diff -Nru /tmp/PUiIyWtJ3S/xkbsel-0.13/configure
/tmp/456Fvq3Ime/xkbsel-0.13/configure
--- /tmp/PUiIyWtJ3S/xkbsel-0.13/configure 2006-06-21 20:58:41.000000000
+0200
+++ /tmp/456Fvq3Ime/xkbsel-0.13/configure 2006-06-21 20:58:42.000000000
+0200
@@ -27176,7 +27176,7 @@
fi
-x11xkbdir=$ac_x_libraries/X11/xkb
+x11xkbdir=/usr/share/X11/xkb
test -d $x11xkbdir || { { echo "$as_me:$LINENO: error: \"Directory $x11xkbdir
does not exist\"" >&5
echo "$as_me: error: \"Directory $x11xkbdir does not exist\"" >&2;}
{ (exit 1); exit 1; }; }
diff -Nru /tmp/PUiIyWtJ3S/xkbsel-0.13/configure.ac
/tmp/456Fvq3Ime/xkbsel-0.13/configure.ac
--- /tmp/PUiIyWtJ3S/xkbsel-0.13/configure.ac 2006-06-21 20:58:41.000000000
+0200
+++ /tmp/456Fvq3Ime/xkbsel-0.13/configure.ac 2006-06-21 20:58:42.000000000
+0200
@@ -68,7 +68,7 @@
AC_SEARCH_LIBS(db_create, db1 db, , AC_MSG_ERROR("Cannot find library
containing db_create"))
-x11xkbdir=$ac_x_libraries/X11/xkb
+x11xkbdir=/usr/share/X11/xkb
test -d $x11xkbdir || AC_MSG_ERROR("Directory $x11xkbdir does not exist")
AC_SUBST(x11xkbdir)
diff -Nru /tmp/PUiIyWtJ3S/xkbsel-0.13/configure.in
/tmp/456Fvq3Ime/xkbsel-0.13/configure.in
--- /tmp/PUiIyWtJ3S/xkbsel-0.13/configure.in 2000-04-09 11:20:47.000000000
+0200
+++ /tmp/456Fvq3Ime/xkbsel-0.13/configure.in 2006-06-21 20:58:42.000000000
+0200
@@ -140,7 +140,7 @@
AC_SEARCH_LIBS(dbm_open, db1 db, , AC_MSG_ERROR("Cannot find library
containing dbm_open"))
-x11xkbdir=$ac_x_libraries/X11/xkb
+x11xkbdir=/usr/share/X11/xkb
test -d $x11xkbdir || AC_MSG_ERROR("Directory $x11xkbdir does not exist")
AC_SUBST(x11xkbdir)
diff -Nru /tmp/PUiIyWtJ3S/xkbsel-0.13/debian/changelog
/tmp/456Fvq3Ime/xkbsel-0.13/debian/changelog
--- /tmp/PUiIyWtJ3S/xkbsel-0.13/debian/changelog 2006-06-21
20:58:41.000000000 +0200
+++ /tmp/456Fvq3Ime/xkbsel-0.13/debian/changelog 2006-06-21
20:58:42.000000000 +0200
@@ -1,3 +1,12 @@
+xkbsel (0.13-13.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Change Build-depends on xlibs to be on libxaw7-dev and xkb-data, and
+ change x11xkbdir to /usr/share/X11/xkb; fixes FTBFS, patch from Andreas
+ Jochens. (Closes: #373200)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Wed, 21 Jun 2006 00:00:37 +0200
+
xkbsel (0.13-13) unstable; urgency=low
* Ported to libdb4.3 -- solves amd64 and ppc64 issues. Closes: #289297.
diff -Nru /tmp/PUiIyWtJ3S/xkbsel-0.13/debian/control
/tmp/456Fvq3Ime/xkbsel-0.13/debian/control
--- /tmp/PUiIyWtJ3S/xkbsel-0.13/debian/control 2006-06-21 20:58:41.000000000
+0200
+++ /tmp/456Fvq3Ime/xkbsel-0.13/debian/control 2006-06-21 20:58:42.000000000
+0200
@@ -2,7 +2,7 @@
Section: x11
Priority: optional
Maintainer: Gregory Pomerantz <[EMAIL PROTECTED]>
-Build-Depends: g++ (>= 3.3.4-1), debhelper, libdb4.3-dev, libjpeg62-dev,
libpng12-dev, libtiff4-dev, libungif4-dev, flex, gettext, libtool, orbit,
texinfo, xlibs, libxaw6-dev
+Build-Depends: debhelper, libxaw7-dev, xkb-data, libdb4.3-dev, libjpeg62-dev,
libpng12-dev, libtiff4-dev, libungif4-dev, flex, gettext, libtool, orbit,
texinfo, libxaw6-dev
Standards-Version: 3.6.1
Package: xkbsel
