From 920ff061175877a5f4e1ef057fc03912c20db287 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Fri, 9 Jul 2010 16:52:36 -0700 Subject: [PATCH] Add changelog workaround for upstream packaging reuse * Add a workaround in the clean target to allow the same packaging files to be used by upstream, which removes changelog during distclean because it's Autoconf-generated. This workaround will not trigger during a normal Debian package build. --- debian/changelog | 4 ++++ debian/rules | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index cdd4de4a5..919383e8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,10 @@ openafs (1.5.75-1) UNRELEASED; urgency=low * Remove conflicts/replaces/provides for openafs-ptutil, which was ancient (removed in 2001). * Install an upstream changelog file now that upstream provides one. + * Add a workaround in the clean target to allow the same packaging files + to be used by upstream, which removes changelog during distclean + because it's Autoconf-generated. This workaround will not trigger + during a normal Debian package build. * Update standards version to 3.9.0. - Use Breaks instead of Conflicts where appropriate. diff --git a/debian/rules b/debian/rules index 5c03a03e6..a21330c22 100755 --- a/debian/rules +++ b/debian/rules @@ -110,13 +110,20 @@ build-stamp: done touch $@ +# The manipulation of debian/changelog here is unnecessary with a regular +# Debian build. It is provided solely so that upstream can share the Debian +# packaging files, working around problems caused by upstream's distclean +# removing packaging/Debian/changelog because it's Autoconf-generated. clean: [ ! -f doc/man-pages/pod1/afs-up.pod ] \ || mv doc/man-pages/pod1/afs-up.pod doc/man-pages/pod1/up.pod set -e; for d in AdminGuide QuickStartUnix UserGuide ; do \ [ ! -f doc/xml/$$d/Makefile ] || $(MAKE) -C doc/xml/$$d clean ; \ done + [ ! -f debian/changelog.in ] \ + || cp debian/changelog debian/changelog.save dh clean + [ -f debian/changelog ] || mv debian/changelog.save debian/changelog install: install-stamp install-stamp: build-stamp -- 2.39.5