and it’s still not picked up right…
[alioth/cvs.git] / debian / rules
index b08d5a4..b8e5e1c 100755 (executable)
@@ -1,9 +1,11 @@
 #!/usr/bin/make -f
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.17 2012/02/07 22:38:36 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/rules,v 1.24 2013/06/26 18:35:52 tg Exp $
 
 CC?=                   gcc
 CONFIGURE_ENV:=                CC='${CC}'
 EXTRA_CFLAGS=          -Wall -fno-strict-aliasing -Wformat
+# addresses part of #698908
+EXTRA_CFLAGS+=         -fwrapv
 # for now. uses are mostly checked.
 EXTRA_CFLAGS+=         -Wno-unused-result
 EXTRA_CPPFLAGS=                -D_GNU_SOURCE -DUSE_LIBBSD
@@ -35,9 +37,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 \
@@ -53,7 +52,7 @@ CONFIGURE_ARGS:=      --prefix=/usr \
                        --enable-case-sensitivity \
                        --enable-encryption \
                        --disable-lock-compatibility \
-                       --disable-rootcommit \
+                       --enable-rootcommit \
                        --disable-old-info-format-support \
                        --enable-config-override=no \
                        --without-krb4 \
@@ -73,19 +72,22 @@ 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/gnulib/m4/mktime.m4 m4/
        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} ${SHELL} ../../configure ${CONFIGURE_ARGS}
+           env ${CONFIGURE_ENV} sh ../../configure ${CONFIGURE_ARGS}
        @:>$@
 
-build build-indep build-arch: debian/.build_stamp
+build-indep:
+build build-arch: debian/.build_stamp
 
 debian/.build_stamp: debian/.configure_stamp
        dh_testdir
@@ -95,6 +97,7 @@ debian/.build_stamp: debian/.configure_stamp
 
 clean:
        dh_testdir
+       dh_autoreconf_clean
        -rm -rf ${CLEANFILES}
        dh_clean
 
@@ -139,7 +142,7 @@ binary-arch: debian/.build_stamp
        dh_installman
        dh_link
        dh_strip
-       dh_compress
+       dh_compress -X.pdf
        cd debian/cvs/usr/share/cvs/contrib && chmod +x descend.sh rcs2sccs.sh
        dh_fixperms
        dh_installdeb