From ac62eb38b0bca7a45835903eb421c19f4f78aca3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 19 May 2013 15:49:24 +0200 Subject: build the en manpages in subdirectory doc/en Building manpages becames more consistent this way and it is simpler to ignore build artefacts, too. --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 5051dab4f..79a6dbe0c 100755 --- a/debian/rules +++ b/debian/rules @@ -203,7 +203,7 @@ apt: build build-manpages dh_bugfiles -p$@ dh_lintian -p$@ dh_installexamples -p$@ $(BLD)/docs/examples/* - dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) + dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) dh_installcron -p$@ dh_installdocs -p$@ dh_installchangelogs -p$@ @@ -253,7 +253,7 @@ apt-utils: build build-manpages dh_installexamples -p$@ # Install the man pages.. - dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES))) + dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES))) dh_installchangelogs -p$@ dh_strip -p$@ -- cgit v1.2.3-70-g09d2 From 8bb62daf9b1bbeec8a40cfed239a8e9ac115353a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 5 Jul 2013 16:41:06 +0200 Subject: debian/rules: * debian/rules: - call dh_clean in clean (closes: #714980) --- debian/changelog | 7 +++++++ debian/rules | 1 + 2 files changed, 8 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index b20bc1f60..295142165 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.9.1) UNRELEASED; urgency=low + + * debian/rules: + - call dh_clean in clean (closes: #714980) + + -- Michael Vogt Fri, 05 Jul 2013 16:39:34 +0200 + apt (0.9.9) unstable; urgency=low [ Michael Vogt ] diff --git a/debian/rules b/debian/rules index 79a6dbe0c..02fed44d5 100755 --- a/debian/rules +++ b/debian/rules @@ -110,6 +110,7 @@ build/build-manpages-stamp: build/configure-stamp clean: dh_testdir + dh_clean [ ! -f Makefile ] || $(MAKE) clean distclean rm -rf build -- cgit v1.2.3-70-g09d2 From a86f851619f720b8c4a74d01274c5e2bf012d451 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 3 Nov 2012 00:39:19 +0100 Subject: cherry pick 39a07ec8f2c612a5af234c7713571362f7ca90b4 --- debian/apt.auto-removal.sh | 67 ++++++++++++++++++++++++++++++++++++++++++++++ debian/apt.conf.autoremove | 3 --- debian/apt.dirs | 1 + debian/changelog | 10 +++++++ debian/rules | 2 ++ 5 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 debian/apt.auto-removal.sh (limited to 'debian/rules') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh new file mode 100644 index 000000000..8f6fc2efc --- /dev/null +++ b/debian/apt.auto-removal.sh @@ -0,0 +1,67 @@ +#!/bin/sh + +set -e + +# Author: Steve Langasek +# +# Mark as not-for-autoremoval those kernel packages that are: +# - the currently booted version +# - the kernel version we've been called for +# - the latest kernel version (determined using rules copied from the grub +# package for deciding which kernel to boot) +# In the common case, this results in exactly two kernels saved, but it can +# result in three kernels being saved. It's better to err on the side of +# saving too many kernels than saving too few. +# +# We generate this list and save it to /etc/apt/apt.conf.d instead of marking +# packages in the database because this runs from a postinst script, and apt +# will overwrite the db when it exits. + +config_file=/etc/apt/apt.conf.d/01autoremove-kernels + +installed_version="$1" +running_version="$(uname -r)" + + +version_test_gt () +{ + local version_test_gt_sedexp="s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g" + local version_a="`echo "$1" | sed -e "$version_test_gt_sedexp"`" + local version_b="`echo "$2" | sed -e "$version_test_gt_sedexp"`" + dpkg --compare-versions "$version_a" gt "$version_b" + return "$?" +} + +list=$(dpkg -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//') + +latest_version="" +for i in $list; do + if version_test_gt "$i" "$latest_version"; then + latest_version="$i" + fi +done + +kernels=$(sort -u < "$config_file".dpkg-new <> "$config_file".dpkg-new + echo " \"^linux-image-extra-$kernel.*\";" >> "$config_file".dpkg-new + echo " \"^linux-signed-image-$kernel.*\";" >> "$config_file".dpkg-new +done +cat >> "$config_file".dpkg-new < Fri, 05 Jul 2013 16:39:34 +0200 apt (0.9.9) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 02fed44d5..3979bd810 100755 --- a/debian/rules +++ b/debian/rules @@ -183,6 +183,8 @@ apt: build build-manpages # apt install # cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove + cp debian/apt.auto-removal.sh debian/$@/etc/kernel/postinst.d/apt-auto-removal + chmod 755 debian/$@/etc/kernel/postinst.d/apt-auto-removal # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir -- cgit v1.2.3-70-g09d2 From ed9ba607b47feae1a435126c5fa05ac2a3690099 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 14:12:29 +0200 Subject: make autoconf happy by "mv configure.{in,ac}" Git-Dch: Ignore --- buildlib/configure.mak | 4 +- configure.ac | 194 +++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 194 ------------------------------------------------- debian/rules | 2 +- prepare-release | 2 +- 5 files changed, 198 insertions(+), 198 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in (limited to 'debian/rules') diff --git a/buildlib/configure.mak b/buildlib/configure.mak index 68d0535b4..7052e4c56 100644 --- a/buildlib/configure.mak +++ b/buildlib/configure.mak @@ -2,7 +2,7 @@ # This make fragment is included by the toplevel make to handle configure # and setup. It defines a target called startup that when run will init -# the build directory, generate configure from configure.in, create aclocal +# the build directory, generate configure from configure.ac, create aclocal # and has rules to run config.status should one of the .in files change. # Input @@ -48,7 +48,7 @@ missing-config-files: @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" exit 100 -configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub +configure: aclocal.m4 configure.ac buildlib/config.guess buildlib/config.sub autoconf aclocal.m4: $(wildcard buildlib/*.m4) diff --git a/configure.ac b/configure.ac new file mode 100644 index 000000000..129be5c12 --- /dev/null +++ b/configure.ac @@ -0,0 +1,194 @@ +ad +dnl Process this file with autoconf to produce a configure script. +dnl The ONLY thing this is used for is to configure for different +dnl linux architectures and configurations, it is not used to make the +dnl code more portable + +dnl You MUST have an environment that has all the POSIX functions and +dnl some of the more populare bsd/sysv ones (like select). You'll also +dnl need a C++ compiler that is semi-standard conformant, exceptions are +dnl not used but STL is. + +dnl 'make -f Makefile startup' will generate the configure file from +dnl configure.ac correctly and can be run at any time + +AC_PREREQ(2.50) +AC_INIT(configure.ac) +AC_CONFIG_AUX_DIR(buildlib) +AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) + +PACKAGE="apt" +PACKAGE_VERSION="0.9.7.6ubuntu2" +PACKAGE_MAIL="APT Development Team " +AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") +AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") +AC_DEFINE_UNQUOTED(PACKAGE_MAIL,"$PACKAGE_MAIL") +AC_SUBST(PACKAGE) +AC_SUBST(PACKAGE_VERSION) +AC_SUBST(PACKAGE_MAIL) + +dnl Check the archs, we want the target type. +AC_CANONICAL_SYSTEM + +dnl Check our C compiler +AC_CHECK_TOOL_PREFIX +AC_PROG_CC +AC_ISC_POSIX + +dnl check for large file support and enable it if possible +dnl do this early as other stuff might depend on it +AC_SYS_LARGEFILE + +dnl Check for other programs +AC_PROG_CXX +AC_PROG_CPP +AC_PROG_RANLIB +AC_CHECK_TOOL(AR,ar,"ar") + +dnl Checks for sockets +SAVE_LIBS="$LIBS" +LIBS="" +AC_SEARCH_LIBS(gethostbyname,nsl) +AC_SEARCH_LIBS(connect,socket) +SOCKETLIBS="$LIBS" +AC_SUBST(SOCKETLIBS) +LIBS="$SAVE_LIBS" + +dnl Checks for pthread -- disabled due to glibc bugs jgg +dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"]) +AC_SUBST(PTHREADLIB) +dnl if test "$PTHREADLIB" != "-lpthread"; then +dnl AC_MSG_ERROR(failed: I need posix threads, pthread) +dnl fi + +dnl Check for BDB +saveLIBS="$LIBS" +LIBS="$LIBS -ldb" + +AC_CHECK_HEADER(db.h, + [AC_MSG_CHECKING(if we can link against BerkeleyDB) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [int r, s, t; db_version(&r, &s, &t);] + )], + [AC_DEFINE(HAVE_BDB) + BDBLIB="-ldb" + AC_MSG_RESULT(yes)], + [BDBLIB="" + AC_MSG_RESULT(no)] + )] +) + +LIBS="$saveLIBS" + +AC_CHECK_LIB(curl, curl_easy_init, + [AC_CHECK_HEADER(curl/curl.h, + curl_ok=yes, + curl_ok=no)], + AC_MSG_ERROR([failed: I need CURL due https support]), +) + +AC_SUBST(BDBLIB) + +HAVE_ZLIB=no +AC_CHECK_LIB(z, gzopen, + [AC_CHECK_HEADER(zlib.h, [HAVE_ZLIB=yes], AC_MSG_ERROR([failed: zlib.h not found]))], + AC_MSG_ERROR([failed: Need libz])) +AC_SUBST(HAVE_ZLIB) +if test "x$HAVE_ZLIB" = "xyes"; then + AC_DEFINE(HAVE_ZLIB) +fi + +HAVE_BZ2=no +AC_CHECK_LIB(bz2, BZ2_bzopen,[AC_CHECK_HEADER(bzlib.h, [HAVE_BZ2=yes], [])], []) +AC_SUBST(HAVE_BZ2) +if test "x$HAVE_BZ2" = "xyes"; then + AC_DEFINE(HAVE_BZ2) +fi + +dnl Converts the ARCH to be something singular for this general CPU family +dnl This is often the dpkg architecture string. +dnl First check against the full canonical canoncial-system-type in $target +dnl and if that fails, just look for the cpu +AC_MSG_CHECKING(debian architecture) +archset="`dpkg-architecture -qDEB_HOST_ARCH`" +if test "x$archset" = "x"; then + AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) +fi +AC_MSG_RESULT($archset) +AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") + +dnl Single Unix Spec statvfs +AC_CHECK_FUNC(statvfs,[HAVE_STATVFS=yes]) +AC_SUBST(HAVE_STATVFS) + +dnl Arg, linux and bsd put their statfs function in different places +if test x"$HAVE_STATVFS" != x"yes"; then + AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[ + AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)]) + ]) +fi + +AC_CHECK_MEMBERS([struct statfs.f_type],,, + [$ac_includes_default + #include ]) + +dnl We should use the real timegm function if we have it. +AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM)) +AC_SUBST(HAVE_TIMEGM) + +dnl Check the architecture +AC_C_BIGENDIAN + +dnl HP-UX sux.. +AC_MSG_CHECKING(for missing socklen_t) +AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[ + AC_DEFINE(NEED_SOCKLEN_T_DEFINE) + NEED_SOCKLEN_T_DEFINE=yes + AC_MSG_RESULT(missing.)]) +AC_SUBST(NEED_SOCKLEN_T_DEFINE) + +dnl HP-UX needs -d_XOPEN_SOURCE_EXTENDED for h_errno +AC_MSG_CHECKING(for h_errno) +AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(normal)], + [CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" + AC_EGREP_HEADER(h_errno, netdb.h, + [AC_MSG_RESULT(needs _XOPEN_SOURCE_EXTENDED)], + [AC_MSG_ERROR("not found.")]) + ]) + +dnl Check for debiandoc +AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html) +AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) + +dnl Check for doxygen +AC_PATH_PROG(DOXYGEN, doxygen) + +dnl Check for the XSLTProc tool needed to build man pages together with po4a +AC_PATH_PROG(XSLTPROC,xsltproc) + +dnl Check for the po4a tool needed to build man pages +AC_PATH_PROG(PO4A,po4a) + +dnl Check for graphviz +AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO]) +AC_PATH_PROG([DOT], [dot], []) +DOTDIR=$(dirname $DOT) +AC_SUBST(DOTDIR) + +ah_NUM_PROCS +ah_GCC3DEP + +dnl It used to be that the user could select translations and that could get +dnl passed to the makefiles, but now that can only work if you use special +dnl gettext approved makefiles, so this feature is unsupported by this. +ALL_LINGUAS="bg bs ca cs cy da de dz el es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv th tl uk vi zn_CN zh_TW" +AM_GNU_GETTEXT(external) +if test x"$USE_NLS" = "xyes"; then + AC_DEFINE(USE_NLS) +fi +AC_SUBST(USE_NLS) +AC_PATH_PROG(BASH, bash) + +AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile:doc/Doxyfile.in,make -s dirs) diff --git a/configure.in b/configure.in deleted file mode 100644 index 4c25ba5d4..000000000 --- a/configure.in +++ /dev/null @@ -1,194 +0,0 @@ -ad -dnl Process this file with autoconf to produce a configure script. -dnl The ONLY thing this is used for is to configure for different -dnl linux architectures and configurations, it is not used to make the -dnl code more portable - -dnl You MUST have an environment that has all the POSIX functions and -dnl some of the more populare bsd/sysv ones (like select). You'll also -dnl need a C++ compiler that is semi-standard conformant, exceptions are -dnl not used but STL is. - -dnl 'make -f Makefile startup' will generate the configure file from -dnl configure.in correctly and can be run at any time - -AC_PREREQ(2.50) -AC_INIT(configure.in) -AC_CONFIG_AUX_DIR(buildlib) -AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) - -PACKAGE="apt" -PACKAGE_VERSION="0.9.7.6ubuntu2" -PACKAGE_MAIL="APT Development Team " -AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") -AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") -AC_DEFINE_UNQUOTED(PACKAGE_MAIL,"$PACKAGE_MAIL") -AC_SUBST(PACKAGE) -AC_SUBST(PACKAGE_VERSION) -AC_SUBST(PACKAGE_MAIL) - -dnl Check the archs, we want the target type. -AC_CANONICAL_SYSTEM - -dnl Check our C compiler -AC_CHECK_TOOL_PREFIX -AC_PROG_CC -AC_ISC_POSIX - -dnl check for large file support and enable it if possible -dnl do this early as other stuff might depend on it -AC_SYS_LARGEFILE - -dnl Check for other programs -AC_PROG_CXX -AC_PROG_CPP -AC_PROG_RANLIB -AC_CHECK_TOOL(AR,ar,"ar") - -dnl Checks for sockets -SAVE_LIBS="$LIBS" -LIBS="" -AC_SEARCH_LIBS(gethostbyname,nsl) -AC_SEARCH_LIBS(connect,socket) -SOCKETLIBS="$LIBS" -AC_SUBST(SOCKETLIBS) -LIBS="$SAVE_LIBS" - -dnl Checks for pthread -- disabled due to glibc bugs jgg -dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"]) -AC_SUBST(PTHREADLIB) -dnl if test "$PTHREADLIB" != "-lpthread"; then -dnl AC_MSG_ERROR(failed: I need posix threads, pthread) -dnl fi - -dnl Check for BDB -saveLIBS="$LIBS" -LIBS="$LIBS -ldb" - -AC_CHECK_HEADER(db.h, - [AC_MSG_CHECKING(if we can link against BerkeleyDB) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [#include ], - [int r, s, t; db_version(&r, &s, &t);] - )], - [AC_DEFINE(HAVE_BDB) - BDBLIB="-ldb" - AC_MSG_RESULT(yes)], - [BDBLIB="" - AC_MSG_RESULT(no)] - )] -) - -LIBS="$saveLIBS" - -AC_CHECK_LIB(curl, curl_easy_init, - [AC_CHECK_HEADER(curl/curl.h, - curl_ok=yes, - curl_ok=no)], - AC_MSG_ERROR([failed: I need CURL due https support]), -) - -AC_SUBST(BDBLIB) - -HAVE_ZLIB=no -AC_CHECK_LIB(z, gzopen, - [AC_CHECK_HEADER(zlib.h, [HAVE_ZLIB=yes], AC_MSG_ERROR([failed: zlib.h not found]))], - AC_MSG_ERROR([failed: Need libz])) -AC_SUBST(HAVE_ZLIB) -if test "x$HAVE_ZLIB" = "xyes"; then - AC_DEFINE(HAVE_ZLIB) -fi - -HAVE_BZ2=no -AC_CHECK_LIB(bz2, BZ2_bzopen,[AC_CHECK_HEADER(bzlib.h, [HAVE_BZ2=yes], [])], []) -AC_SUBST(HAVE_BZ2) -if test "x$HAVE_BZ2" = "xyes"; then - AC_DEFINE(HAVE_BZ2) -fi - -dnl Converts the ARCH to be something singular for this general CPU family -dnl This is often the dpkg architecture string. -dnl First check against the full canonical canoncial-system-type in $target -dnl and if that fails, just look for the cpu -AC_MSG_CHECKING(debian architecture) -archset="`dpkg-architecture -qDEB_HOST_ARCH`" -if test "x$archset" = "x"; then - AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) -fi -AC_MSG_RESULT($archset) -AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") - -dnl Single Unix Spec statvfs -AC_CHECK_FUNC(statvfs,[HAVE_STATVFS=yes]) -AC_SUBST(HAVE_STATVFS) - -dnl Arg, linux and bsd put their statfs function in different places -if test x"$HAVE_STATVFS" != x"yes"; then - AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[ - AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)]) - ]) -fi - -AC_CHECK_MEMBERS([struct statfs.f_type],,, - [$ac_includes_default - #include ]) - -dnl We should use the real timegm function if we have it. -AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM)) -AC_SUBST(HAVE_TIMEGM) - -dnl Check the architecture -AC_C_BIGENDIAN - -dnl HP-UX sux.. -AC_MSG_CHECKING(for missing socklen_t) -AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[ - AC_DEFINE(NEED_SOCKLEN_T_DEFINE) - NEED_SOCKLEN_T_DEFINE=yes - AC_MSG_RESULT(missing.)]) -AC_SUBST(NEED_SOCKLEN_T_DEFINE) - -dnl HP-UX needs -d_XOPEN_SOURCE_EXTENDED for h_errno -AC_MSG_CHECKING(for h_errno) -AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(normal)], - [CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" - AC_EGREP_HEADER(h_errno, netdb.h, - [AC_MSG_RESULT(needs _XOPEN_SOURCE_EXTENDED)], - [AC_MSG_ERROR("not found.")]) - ]) - -dnl Check for debiandoc -AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html) -AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) - -dnl Check for doxygen -AC_PATH_PROG(DOXYGEN, doxygen) - -dnl Check for the XSLTProc tool needed to build man pages together with po4a -AC_PATH_PROG(XSLTPROC,xsltproc) - -dnl Check for the po4a tool needed to build man pages -AC_PATH_PROG(PO4A,po4a) - -dnl Check for graphviz -AC_CHECK_PROG([HAVE_DOT], [dot], [YES], [NO]) -AC_PATH_PROG([DOT], [dot], []) -DOTDIR=$(dirname $DOT) -AC_SUBST(DOTDIR) - -ah_NUM_PROCS -ah_GCC3DEP - -dnl It used to be that the user could select translations and that could get -dnl passed to the makefiles, but now that can only work if you use special -dnl gettext approved makefiles, so this feature is unsupported by this. -ALL_LINGUAS="bg bs ca cs cy da de dz el es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv th tl uk vi zn_CN zh_TW" -AM_GNU_GETTEXT(external) -if test x"$USE_NLS" = "xyes"; then - AC_DEFINE(USE_NLS) -fi -AC_SUBST(USE_NLS) -AC_PATH_PROG(BASH, bash) - -AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile:doc/Doxyfile.in,make -s dirs) diff --git a/debian/rules b/debian/rules index 3979bd810..05dcf813c 100755 --- a/debian/rules +++ b/debian/rules @@ -76,7 +76,7 @@ build-manpages: build/build-manpages-stamp build/environment.mak: build/configure-stamp @true -configure: configure.in +configure: configure.ac build/configure-stamp: configure dh_testdir -mkdir build diff --git a/prepare-release b/prepare-release index 73c0be602..2d8502d7f 100755 --- a/prepare-release +++ b/prepare-release @@ -39,7 +39,7 @@ if [ "$1" = 'pre-export' ]; then make update-po fi - sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.in + sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.ac sed -i -e "s/^$//" doc/apt-verbatim.ent elif [ "$1" = 'post-build' ]; then if [ "$DISTRIBUTION" != "UNRELEASED" ]; then -- cgit v1.2.3-70-g09d2 From ee7ddf1294fca70088f8dcc15bf87323870bd417 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 19:13:55 +0200 Subject: implement debian/rules build-{arch,indep} as required by policy 3.9.4 --- debian/control | 2 +- debian/rules | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'debian/rules') diff --git a/debian/control b/debian/control index 29d67d765..ca18ff01f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Julian Andres Klode -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, diff --git a/debian/rules b/debian/rules index 05dcf813c..4686f569d 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) # do not fail as we are just experimenting with symbol files for now export DPKG_GENSYMBOLS_CHECK_LEVEL=0 -build: build/build-stamp +build-binary: build/build-binary-stamp build-debiandoc: build/build-debiandoc-stamp build-manpages: build/build-manpages-stamp @@ -84,7 +84,7 @@ build/configure-stamp: configure cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags) touch $@ -build/build-stamp: build/configure-stamp +build/build-binary-stamp: build/configure-stamp # Add here commands to compile the package. $(MAKE) binary # compat symlink for the locale split @@ -120,7 +120,6 @@ clean: debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ -binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. libapt-pkg-doc: build-debiandoc dh_testdir -p$@ @@ -172,9 +171,8 @@ apt-doc: build-debiandoc # Build architecture-dependent files here. -binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list -apt: build build-manpages +apt: build-binary build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -220,7 +218,7 @@ apt: build build-manpages dh_md5sums -p$@ dh_builddeb -p$@ -libapt-pkg-dev: build debian/libapt-pkg-dev.install +libapt-pkg-dev: build-binary debian/libapt-pkg-dev.install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -240,7 +238,7 @@ libapt-pkg-dev: build debian/libapt-pkg-dev.install dh_builddeb -p$@ apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates -apt-utils: build build-manpages +apt-utils: build-binary build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -269,7 +267,7 @@ apt-utils: build build-manpages dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install +$(LIBAPT_PKG): build-binary debian/$(LIBAPT_PKG).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -288,7 +286,7 @@ $(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_INST): build debian/$(LIBAPT_INST).install +$(LIBAPT_INST): build-binary debian/$(LIBAPT_INST).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -307,7 +305,7 @@ $(LIBAPT_INST): build debian/$(LIBAPT_INST).install dh_md5sums -p$@ dh_builddeb -p$@ -apt-transport-https: build libapt-pkg-dev +apt-transport-https: build-binary libapt-pkg-dev dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -333,10 +331,12 @@ apt-transport-https: build libapt-pkg-dev configure: $(MAKE) configure -really-clean: clean - -find . -name Makefile.in -print0 | xargs --null --no-run-if-empty -- rm -f - find -name ChangeLog | xargs rm -f - rm -f l33ch-stamp - +# translate targets to targets required by debian-policy +binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https +binary-indep: apt-doc libapt-pkg-doc binary: binary-indep binary-arch +build-arch: build-binary +build-indep: build-manpages build-debiandoc +build: build-indep build-arch + .PHONY: build clean binary-indep binary-arch binary -- cgit v1.2.3-70-g09d2 From e941cc69cf3e90ab799dec24587bb339db07038f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 22:37:43 +0200 Subject: exclude config.{sub,guess} from source package Lintian complains about these links in the source package as they leave the source directory and as they are autogenerated there isn't that much sense in shipping them, we can just recreate them before calling configure. --- debian/rules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 4686f569d..fc44d5a68 100755 --- a/debian/rules +++ b/debian/rules @@ -77,7 +77,7 @@ build/environment.mak: build/configure-stamp @true configure: configure.ac -build/configure-stamp: configure +build/configure-stamp: configure buildlib/config.sub buildlib/config.guess dh_testdir -mkdir build cp COPYING debian/copyright @@ -116,6 +116,8 @@ clean: rm -rf build rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \ debian/libapt-pkg-dev.install + test ! -L buildlib/config.guess || rm -f buildlib/config.guess + test ! -L buildlib/config.sub || rm -f buildlib/config.sub debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ @@ -328,6 +330,9 @@ apt-transport-https: build-binary libapt-pkg-dev dh_md5sums -p$@ dh_builddeb -p$@ +buildlib/config.guess buildlib/config.sub: + $(MAKE) "$@" + configure: $(MAKE) configure -- cgit v1.2.3-70-g09d2