diff options
author | Andreas Beckmann <anbe@debian.org> | 2014-05-22 19:01:50 +0200 |
---|---|---|
committer | Andreas Beckmann <anbe@debian.org> | 2014-05-22 19:01:50 +0200 |
commit | 9484a447e740a770434ed553e0c3e63f0a3504d7 (patch) | |
tree | 09aba5c17790c50739b23bc5706d38945c127a57 | |
parent | 5f3bdde432aa895d559d6bb11172a641bc5c69b4 (diff) | |
download | sendmail-9484a447e740a770434ed553e0c3e63f0a3504d7.tar.gz |
do not regenerate d/changelog
I have no clue what this was supposed to be good for ...
-rw-r--r-- | debian/build/debian/changelog.sh.in | 71 | ||||
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/configure.ac | 6 | ||||
-rwxr-xr-x | debian/rules | 2 |
4 files changed, 1 insertions, 79 deletions
diff --git a/debian/build/debian/changelog.sh.in b/debian/build/debian/changelog.sh.in deleted file mode 100644 index 8b95f68..0000000 --- a/debian/build/debian/changelog.sh.in +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -e -#----------------------------------------------------------------------------- -# $Sendmail: changelog.sh,v @sm_version@ @sm_date@ @sm_time@ cowboy Exp $ -# -# Copyright (c) 1998-@SM_CPYRT@ Richard Nelson. All Rights Reserved. -# -# @configure_input@ -# -# Debian script to generate changelogs for sendmail @sm_version@@sm_revision@ -# -# Note: this file supports @SM_MINVERS@ - @SM_MAXVERS@ -# -#----------------------------------------------------------------------------- -set -e; -# -# Initialization -PACKAGE='sendmail'; - -# -# Remove old combined changelog -rm -f build/debian/changelog; - -echo "Building @PACKAGE_NAME@ @sm_version@@sm_custom_s@@sm_revision@ (@sm_version_math@) changelog."; - -# -# Start with Custom changelog (if any) -if [ -n "@sm_custom@" ]; then - if [ -f @sm_custom@.changelog ]; then - cat @sm_custom@.changelog \ - >> build/debian/changelog; - fi; - fi; - -# -# Create a combined changelog *IFF* we have the pieces/parts... -if [ ! -d private/changelogs ]; then - cat changelog >>build/debian/changelog; -else - # - # v.r.m changelogs - if [ -f private/changelogs/@sm_version@ ]; then - cat private/changelogs/@sm_version@ \ - >> build/debian/changelog; - # - # v.r changelogs - elif [ -f private/changelogs/@sm_version_major@ ]; then - cat private/changelogs/@sm_version_major@ >> build/debian/changelog; - - # - # v changelogs - elif [ -f private/changelogs/@sm_version_v@ ]; then - cat private/changelogs/@sm_version_v@ >> build/debian/changelog; - fi; - # - # Variable definitions - cat private/changelogs/vars >> build/debian/changelog; - fi; - -# -# Update 1st line to add --with-custom (defaults to null) -if [ -z "@sm_custom@" ]; then - mv build/debian/changelog build/debian/changelog.in; -else - sed \ - -e '1s/sendmail (@sm_version@-/sendmail (@sm_version@@sm_custom_s@-/' \ - -e '1s/sendmail (@sm_custom@.@sm_version@-/sendmail (@sm_version@@sm_custom_s@-/' \ - build/debian/changelog \ - > build/debian/changelog.in; - rm build/debian/changelog; - fi; - diff --git a/debian/changelog b/debian/changelog index 2fd8992..e144f0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ sendmail (8.14.4-6) UNRELEASED; urgency=medium (backported from 8.14.8), thanks to David F. Skoll. (Closes: #747910) * Apply manpage corrections from Ubuntu. (Closes: #747551) * Remove outdated documentation and other cruft. + * Don't re-generate d/changelog during build. * Create directories during 'd/rules install' instead of using .dirs. -- Andreas Beckmann <anbe@debian.org> Tue, 22 Apr 2014 17:01:07 +0200 diff --git a/debian/configure.ac b/debian/configure.ac index 1a1c081..df94fc4 100644 --- a/debian/configure.ac +++ b/debian/configure.ac @@ -1666,12 +1666,6 @@ AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([build/autoconf.mk]) AC_CONFIG_FILES([build/autoconf.pl]) AC_CONFIG_FILES([build/autoconf.sh]) -AC_CONFIG_FILES([build/debian/changelog.sh],[ - echo 'creating ./build/debian/changelog.in'; - chmod ug+x ./build/debian/changelog.sh; - ./build/debian/changelog.sh;]) -AC_CONFIG_FILES([build/debian/changelog:build/debian/changelog.in],[ - cp build/debian/changelog ./;]) AC_CONFIG_FILES([build/update_chaos],[ echo 'Updating Build setup'; chmod ug+x ./build/update_chaos; diff --git a/debian/rules b/debian/rules index 9374488..0993c5a 100755 --- a/debian/rules +++ b/debian/rules @@ -134,7 +134,6 @@ configure:: common-configure-arch common-configure-indep #------------- # Maintainer only rule... refresh debian/configure and debian/*/Makefile.in AUTOFOODUMMY = debian/AUTHORS debian/COPYING debian/ChangeLog debian/INSTALL debian/NEWS debian/README -AUTOFOODUMMY += debian/build/debian/changelog.in AUTOMAKEARGS ?= --force AUTOMAKEARGS ?= --force --force-missing --add-missing --copy refresh-debian-configure: @@ -258,7 +257,6 @@ clean:: debian/config.log \ debian/config.status \ debian/*.debhelper \ - debian/build/debian/changelog.in \ debian/build/debian/control \ ; for file in tmp ${DEB_PACKAGES};do \ |