tags 616775 + patch tags 616775 + pending thanks Dear maintainer,
I've prepared an NMU for cdbs (versioned as 0.4.121+nmu1). The debdiff, based on a patch in Ubuntu, is attached here. Regards. -- Andrea Colangelo | http://andreacolangelo.com Ubuntu Developer <www.ubuntu.com> | Debian Maintainer <www.debian.org>
diff -Nru cdbs-0.4.121/configure cdbs-0.4.121+nmu1/configure --- cdbs-0.4.121/configure 2012-03-08 20:34:12.000000000 +0100 +++ cdbs-0.4.121+nmu1/configure 2013-06-27 16:31:43.000000000 +0200 @@ -564,6 +564,12 @@ ac_unique_file="1/rules/buildcore.mk.in" ac_subst_vars='LTLIBOBJS LIBOBJS +HAVE_PYSUPPORT_FALSE +HAVE_PYSUPPORT_TRUE +HAVE_PYCENTRAL_FALSE +HAVE_PYCENTRAL_TRUE +PYSUPPORT +PYCENTRAL MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -2214,6 +2220,96 @@ MAINT=$MAINTAINER_MODE_TRUE +# Extract the first word of "dh_pycentral", so it can be a program name with args. +set dummy dh_pycentral; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PYCENTRAL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PYCENTRAL"; then + ac_cv_prog_PYCENTRAL="$PYCENTRAL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PYCENTRAL="dh_pycentral" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PYCENTRAL=$ac_cv_prog_PYCENTRAL +if test -n "$PYCENTRAL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYCENTRAL" >&5 +$as_echo "$PYCENTRAL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +# Extract the first word of "dh_pysupport", so it can be a program name with args. +set dummy dh_pysupport; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PYSUPPORT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PYSUPPORT"; then + ac_cv_prog_PYSUPPORT="$PYSUPPORT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_PYSUPPORT="dh_pysupport" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PYSUPPORT=$ac_cv_prog_PYSUPPORT +if test -n "$PYSUPPORT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYSUPPORT" >&5 +$as_echo "$PYSUPPORT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x${PYCENTRAL}" != x; then + HAVE_PYCENTRAL_TRUE= + HAVE_PYCENTRAL_FALSE='#' +else + HAVE_PYCENTRAL_TRUE='#' + HAVE_PYCENTRAL_FALSE= +fi + + if test "x${PYSUPPORT}" != x; then + HAVE_PYSUPPORT_TRUE= + HAVE_PYSUPPORT_FALSE='#' +else + HAVE_PYSUPPORT_TRUE='#' + HAVE_PYSUPPORT_FALSE= +fi + ac_config_files="$ac_config_files Makefile test/Makefile" cat >confcache <<\_ACEOF @@ -2366,6 +2462,14 @@ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_PYCENTRAL_TRUE}" && test -z "${HAVE_PYCENTRAL_FALSE}"; then + as_fn_error $? "conditional \"HAVE_PYCENTRAL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_PYSUPPORT_TRUE}" && test -z "${HAVE_PYSUPPORT_FALSE}"; then + as_fn_error $? "conditional \"HAVE_PYSUPPORT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff -Nru cdbs-0.4.121/configure.ac cdbs-0.4.121+nmu1/configure.ac --- cdbs-0.4.121/configure.ac 2010-05-22 22:52:01.000000000 +0200 +++ cdbs-0.4.121+nmu1/configure.ac 2013-06-27 16:31:43.000000000 +0200 @@ -20,5 +20,9 @@ AC_CONFIG_SRCDIR(1/rules/buildcore.mk.in) AM_INIT_AUTOMAKE AM_MAINTAINER_MODE +AC_CHECK_PROG(PYCENTRAL,dh_pycentral,dh_pycentral) +AC_CHECK_PROG(PYSUPPORT,dh_pysupport,dh_pysupport) +AM_CONDITIONAL(HAVE_PYCENTRAL,test "x${PYCENTRAL}" != x) +AM_CONDITIONAL(HAVE_PYSUPPORT,test "x${PYSUPPORT}" != x) AC_CONFIG_FILES([Makefile test/Makefile]) AC_OUTPUT diff -Nru cdbs-0.4.121/debian/changelog cdbs-0.4.121+nmu1/debian/changelog --- cdbs-0.4.121/debian/changelog 2013-04-08 21:49:21.000000000 +0200 +++ cdbs-0.4.121+nmu1/debian/changelog 2013-06-27 16:50:00.000000000 +0200 @@ -1,3 +1,13 @@ +cdbs (0.4.121+nmu1) unstable; urgency=low + + * Non-maintainer upload. + * Makefile.in, configure, configure.ac, debian/control.in, test/Makefile.am, + test/Makefile.in: Drop build dependency on python-support and + python-central. Disable distutils pycentral and pysupport tests if the + tools are not present. Patch from Ubuntu. (Closes: #616775) + + -- Andrea Colangelo <war...@ubuntu.com> Thu, 27 Jun 2013 16:33:32 +0200 + cdbs (0.4.121) unstable; urgency=low * Fix avoid bogus quotes when setting PERL_AUTOINSTALL for perl diff -Nru cdbs-0.4.121/debian/control cdbs-0.4.121+nmu1/debian/control --- cdbs-0.4.121/debian/control 2013-04-08 21:50:07.000000000 +0200 +++ cdbs-0.4.121+nmu1/debian/control 2013-06-27 16:56:07.000000000 +0200 @@ -10,8 +10,6 @@ python-dev, python-all-dev, python3-all-dev, - python-central, - python-support, ant, default-jdk, sharutils, diff -Nru cdbs-0.4.121/debian/control.in cdbs-0.4.121+nmu1/debian/control.in --- cdbs-0.4.121/debian/control.in 2013-04-08 21:38:19.000000000 +0200 +++ cdbs-0.4.121+nmu1/debian/control.in 2013-06-27 16:33:22.000000000 +0200 @@ -8,8 +8,6 @@ python-dev, python-all-dev, python3-all-dev, - python-central, - python-support, ant, default-jdk, sharutils, diff -Nru cdbs-0.4.121/Makefile.in cdbs-0.4.121+nmu1/Makefile.in --- cdbs-0.4.121/Makefile.in 2012-03-08 20:34:14.000000000 +0100 +++ cdbs-0.4.121+nmu1/Makefile.in 2013-06-27 16:31:43.000000000 +0200 @@ -53,7 +53,7 @@ subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) mkinstalldirs \ - mkinstalldirs $(dist_man_MANS) + $(dist_man_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -143,6 +143,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PYCENTRAL = @PYCENTRAL@ +PYSUPPORT = @PYSUPPORT@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ diff -Nru cdbs-0.4.121/test/Makefile.am cdbs-0.4.121+nmu1/test/Makefile.am --- cdbs-0.4.121/test/Makefile.am 2010-12-27 00:15:14.000000000 +0100 +++ cdbs-0.4.121+nmu1/test/Makefile.am 2013-06-27 16:31:43.000000000 +0200 @@ -20,6 +20,22 @@ EXTRA_DIST = testsuite_functions +if HAVE_PYCENTRAL +PYCENTRAL_TESTS = \ + distutils-1.sh \ + distutils-2.sh \ + distutils-3.sh \ + distutils-4.sh +endif + +if HAVE_PYSUPPORT +PYSUPPORT_TESTS = \ + distutils-5.sh \ + distutils-6.sh \ + distutils-7.sh \ + distutils-8.sh +endif + TESTS = autotools-1.sh \ autotools-2.sh \ autotools-3.sh \ @@ -38,14 +54,8 @@ debhelper-7.sh \ patchsys-1.sh \ list-missing-1.sh \ - distutils-1.sh \ - distutils-2.sh \ - distutils-3.sh \ - distutils-4.sh \ - distutils-5.sh \ - distutils-6.sh \ - distutils-7.sh \ - distutils-8.sh \ + $(PYCENTRAL_TESTS) \ + $(PYSUPPORT_TESTS) \ distutils-9.sh \ distutils-10.sh \ distutils-11.sh \ diff -Nru cdbs-0.4.121/test/Makefile.in cdbs-0.4.121+nmu1/test/Makefile.in --- cdbs-0.4.121/test/Makefile.in 2012-03-08 20:34:14.000000000 +0100 +++ cdbs-0.4.121+nmu1/test/Makefile.in 2013-06-27 16:31:43.000000000 +0200 @@ -75,6 +75,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PYCENTRAL = @PYCENTRAL@ +PYSUPPORT = @PYSUPPORT@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -122,6 +124,18 @@ # Run these tests silently so we can see what fails TESTS_ENVIRONMENT = TESTS_SILENT=true EXTRA_DIST = testsuite_functions +@HAVE_PYCENTRAL_TRUE@PYCENTRAL_TESTS = \ +@HAVE_PYCENTRAL_TRUE@ distutils-1.sh \ +@HAVE_PYCENTRAL_TRUE@ distutils-2.sh \ +@HAVE_PYCENTRAL_TRUE@ distutils-3.sh \ +@HAVE_PYCENTRAL_TRUE@ distutils-4.sh + +@HAVE_PYSUPPORT_TRUE@PYSUPPORT_TESTS = \ +@HAVE_PYSUPPORT_TRUE@ distutils-5.sh \ +@HAVE_PYSUPPORT_TRUE@ distutils-6.sh \ +@HAVE_PYSUPPORT_TRUE@ distutils-7.sh \ +@HAVE_PYSUPPORT_TRUE@ distutils-8.sh + TESTS = autotools-1.sh \ autotools-2.sh \ autotools-3.sh \ @@ -140,14 +154,8 @@ debhelper-7.sh \ patchsys-1.sh \ list-missing-1.sh \ - distutils-1.sh \ - distutils-2.sh \ - distutils-3.sh \ - distutils-4.sh \ - distutils-5.sh \ - distutils-6.sh \ - distutils-7.sh \ - distutils-8.sh \ + $(PYCENTRAL_TESTS) \ + $(PYSUPPORT_TESTS) \ distutils-9.sh \ distutils-10.sh \ distutils-11.sh \
signature.asc
Description: Digital signature