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.

diff --git a/debian/changelog b/debian/changelog
index cdd4de4a5bde81652a727d2d5c56ef2b42f68211..919383e8a07c91727d9faf9243ddd9d7149124e9 100644 (file)
--- 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 5c03a03e6f154ea11841b0cb65dd59ba4d84fee0..a21330c22e53e6e920de837785d1ae17a6188745 100755 (executable)
--- 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