Package: xdkcal Version: 0.9d-2.1 Severity: normal Tags: patch Hi,
Attached is the diff for my xdkcal 0.9d-2.2 NMU which will be uploaded to DELAYED-5. Cheers Luk -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
reverted:
--- xdkcal-0.9d/config.log
+++ xdkcal-0.9d.orig/config.log
@@ -1,156 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by configure, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-
- $ ./configure --prefix=/usr/X11R6 --mandir=${prefix}/man
--infodir=${prefix}/share/info
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = lap
-uname -m = i686
-uname -r = 2.6.15-1-k7
-uname -s = Linux
-uname -v = #2 Tue Jan 10 23:06:33 UTC 2006
-
-/usr/bin/uname -p = unknown
-/bin/uname -X = unknown
-
-/bin/arch = i686
-/usr/bin/arch -k = unknown
-/usr/convex/getsysinfo = unknown
-hostinfo = unknown
-/bin/machine = unknown
-/usr/bin/oslevel = unknown
-/bin/universe = unknown
-
-PATH: /usr/sbin
-PATH: /usr/bin
-PATH: /sbin
-PATH: /bin
-PATH: /usr/bin/X11
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-configure:1326: error: cannot find install-sh or install.sh in . ./.. ./../..
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_env_CC_set=
-ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=
-ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=
-ac_cv_env_CPPFLAGS_value=
-ac_cv_env_CPP_set=
-ac_cv_env_CPP_value=
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
-
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-
-ACLOCAL=''
-AMDEPBACKSLASH=''
-AMDEP_FALSE=''
-AMDEP_TRUE=''
-AMTAR=''
-AUTOCONF=''
-AUTOHEADER=''
-AUTOMAKE=''
-AWK=''
-CC=''
-CCDEPMODE=''
-CFLAGS=''
-CPP=''
-CPPFLAGS=''
-CYGPATH_W=''
-DEFS=''
-DEPDIR=''
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
-EGREP=''
-EXEEXT=''
-INSTALL_DATA=''
-INSTALL_PROGRAM=''
-INSTALL_SCRIPT=''
-INSTALL_STRIP_PROGRAM=''
-LDFLAGS=''
-LIBOBJS=''
-LIBS=''
-LTLIBOBJS=''
-MAKEINFO=''
-OBJEXT=''
-OPTFLAG=''
-PACKAGE=''
-PACKAGE_BUGREPORT=''
-PACKAGE_NAME=''
-PACKAGE_STRING=''
-PACKAGE_TARNAME=''
-PACKAGE_VERSION=''
-PATH_SEPARATOR=':'
-SET_MAKE=''
-SHELL='/bin/sh'
-STRIP=''
-VERSION=''
-X_CFLAGS=''
-X_EXTRA_LIBS=''
-X_LIBS=''
-X_PRE_LIBS=''
-ac_ct_CC=''
-ac_ct_STRIP=''
-am__fastdepCC_FALSE=''
-am__fastdepCC_TRUE=''
-am__include=''
-am__leading_dot=''
-am__quote=''
-am__tar=''
-am__untar=''
-bindir='${exec_prefix}/bin'
-build_alias=''
-datadir='${prefix}/share'
-exec_prefix='NONE'
-host_alias=''
-includedir='${prefix}/include'
-infodir='${prefix}/share/info'
-install_sh=''
-libdir='${exec_prefix}/lib'
-libexecdir='${exec_prefix}/libexec'
-localstatedir='${prefix}/var'
-mandir='${prefix}/man'
-mkdir_p=''
-oldincludedir='/usr/include'
-prefix='/usr/X11R6'
-program_transform_name='s,x,x,'
-sbindir='${exec_prefix}/sbin'
-sharedstatedir='${prefix}/com'
-sysconfdir='${prefix}/etc'
-target_alias=''
-
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE_NAME ""
-#define PACKAGE_STRING ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_VERSION ""
-
-configure: exit 1
diff -u xdkcal-0.9d/debian/changelog xdkcal-0.9d/debian/changelog
--- xdkcal-0.9d/debian/changelog
+++ xdkcal-0.9d/debian/changelog
@@ -1,3 +1,10 @@
+xdkcal (0.9d-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Xorg 7 transition (Closes: #376402).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Tue, 4 Jul 2006 16:23:23 +0200
+
xdkcal (0.9d-2.1) unstable; urgency=high
* Non-maintainer upload.
@@ -74,3 +80,0 @@
-Local variables:
-mode: debian-changelog
-End:
diff -u xdkcal-0.9d/debian/menu xdkcal-0.9d/debian/menu
--- xdkcal-0.9d/debian/menu
+++ xdkcal-0.9d/debian/menu
@@ -1,2 +1,2 @@
-?package(xdkcal):needs=X11 section=Apps/Tools\
- title="xdkcal" command="/usr/X11R6/bin/xdkcal"
+?package(xdkcal):needs="X11" section="Apps/Tools"\
+ title="xdkcal" command="/usr/bin/xdkcal"
diff -u xdkcal-0.9d/debian/rules xdkcal-0.9d/debian/rules
--- xdkcal-0.9d/debian/rules
+++ xdkcal-0.9d/debian/rules
@@ -12,7 +12,7 @@
build-stamp:
dh_testdir
- ./configure --prefix=/usr/X11R6 --mandir=\$${prefix}/man
--infodir=\$${prefix}/share/info
+ ./configure --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info
# Add here commands to compile the package.
$(MAKE)
@@ -35,7 +35,7 @@
dh_installdirs
# Add here commands to install the package into debian/tmp.
- $(MAKE) install prefix=`pwd`/debian/tmp/usr/X11R6
+ $(MAKE) install prefix=`pwd`/debian/tmp/usr
# Build architecture-independent files here.
signature.asc
Description: Digital signature
