apply patch from Daniel Schepler to fix mktime.m4
authortg <tg@mirbsd.org>
Wed, 26 Jun 2013 17:53:16 +0000 (17:53 +0000)
committertg <tg@mirbsd.org>
Wed, 26 Jun 2013 17:53:16 +0000 (17:53 +0000)
configure.in
debian/changelog
debian/control
debian/rules

index e0f9555..6c463a7 100644 (file)
@@ -20,6 +20,7 @@ AC_INIT([Concurrent Versions System (CVS)],[1.12.13-MirDebian-9],
 AC_CONFIG_SRCDIR(src/cvs.h)
 AC_CONFIG_AUX_DIR(build-aux)
 AM_INIT_AUTOMAKE([gnu 1.9.2 dist-bzip2 no-define])
+AM_GNU_GETTEXT_VERSION([0.14.4])
 AC_PREREQ(2.59)
 
 AC_PREFIX_PROGRAM(cvs)
index 71bffdc..42bf3d5 100644 (file)
@@ -1,5 +1,11 @@
 cvs (2:1.12.13+real-10) xunstable; urgency=low
 
+  [ Daniel Schepler ]
+  * Use dh-autoreconf to regenerate configure script and avoid unnecessary
+    compilation of mktime.c, which doesn't work on x32 as is.
+    (Closes: #698908)
+
+  [ Thorsten Glaser ]
   * Do not compress *.pdf files (cf. #704093)
   * Allow root to commit
 
index 7ee3c89..1125f6b 100644 (file)
@@ -1,12 +1,13 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.19 2012/04/22 15:16:08 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/control,v 1.20 2013/06/26 17:53:15 tg Exp $
 #
 Source: cvs
 Section: vcs
 Priority: optional
 Maintainer: Thorsten Glaser <tg@mirbsd.de>
 Homepage: http://www.nongnu.org/cvs/
-Build-Depends: debhelper (>= 5), autotools-dev, bsdmainutils, groff,
- libbsd-dev, libkrb5-dev | heimdal-dev, texi2html, texinfo,
+Build-Depends: debhelper (>= 5), autopoint, autotools-dev,
+ bsdmainutils, dh-autoreconf, groff, libbsd-dev,
+ libkrb5-dev | heimdal-dev, texi2html, texinfo,
  texlive-latex-base, zlib1g-dev
 Standards-Version: 3.9.3
 # First word is the $CVSROOT (-d arg) string, second word the module.
index a38750c..b137778 100755 (executable)
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.20 2013/06/26 17:43:53 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.21 2013/06/26 17:53:16 tg Exp $
 
 CC?=                   gcc
 CONFIGURE_ENV:=                CC='${CC}'
@@ -35,9 +35,6 @@ LIBS+=                        -lbsd
 CONFIGURE_ENV+=                LIBS='${LIBS}'
 CONFIGURE_ENV+=                CSH=/bin/csh
 
-# check takes forever, so assume the safe choice
-CONFIGURE_ENV+=                ac_cv_func_working_mktime=no
-
 CONFIGURE_ARGS:=       --prefix=/usr \
                        --infodir=/usr/share/info \
                        --mandir=/usr/share/man \
@@ -73,13 +70,13 @@ CLEANFILES:=                autom4te.cache debian/CVSTEMP debian/.*_stamp \
                        build-aux/config.guess build-aux/config.sub \
                        doc/cvs.1 doc/cvs.info* doc/cvsclient.info* \
                        doc/cvs.pdf doc/cvsclient.pdf \
-                       doc/getdate-cvs.texi \
+                       doc/getdate-cvs.texi m4/mktime.m4 \
                        vms/config.h windows-NT/config.h
 
 debian/.configure_stamp:
        dh_testdir
        -rm -rf ${CLEANFILES}
-       cp /usr/share/misc/config.guess /usr/share/misc/config.sub build-aux/
+       dh_autoreconf
        mkdir debian/builddir debian/stagedir
        cd debian/builddir && \
            env ${CONFIGURE_ENV} sh ../../configure ${CONFIGURE_ARGS}
@@ -95,6 +92,7 @@ debian/.build_stamp: debian/.configure_stamp
 
 clean:
        dh_testdir
+       dh_autoreconf_clean
        -rm -rf ${CLEANFILES}
        dh_clean