d/copyright: Fix the names of upstream's release tag and our tarball

Introduce a new substitution variable, DEBORIG_VERSION.

diff --git a/debian/copyright b/debian/copyright
index 6eda0800c5d69d7fb975584664ecb06e7cdd1c58..a56d3a318eb690888e1430773207b867ad82f7ac 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,8 +10,8 @@ Comment:
   
   The original source for this package can be found at
   git://git.savannah.gnu.org/emacs.git under the
-  emacs-28.1 tag.  That tag was used to create the
-  Debian upstream archive (emacs_1:28.1+1.orig.tar.xz)
+  emacs-28.2 tag.  That tag was used to create the
+  Debian upstream archive (emacs_28.2+1.orig.tar.xz)
   after making adjustments to comply with the DFSG (see below).
   
   Please see /usr/share/doc/emacs-common/README.Debian.gz for a

diff --git a/debian/copyright.in b/debian/copyright.in
index 21c8135fbdc9b94773c4a00c486fab6b9555f393..54fad929e853a6b9473ac0ef50822b3894896401 100644 (file)
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -11,7 +11,7 @@ Comment:
   The original source for this package can be found at
   git://git.savannah.gnu.org/emacs.git under the
   emacs-@UPSTREAM_VERSION@ tag.  That tag was used to create the
-  Debian upstream archive (emacs_@DEBSRC_VERSION@.orig.tar.xz)
+  Debian upstream archive (emacs_@DEBORIG_VERSION@.orig.tar.xz)
   after making adjustments to comply with the DFSG (see below).
   
   Please see /usr/share/doc/emacs-common/README.Debian.gz for a

diff --git a/debian/rules b/debian/rules
index 125fb59c53b5e8e3a2a6c3577a77c364785da839..46a7320a9a7d38fb592644479bccfffbc4a4e92e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -68,6 +68,9 @@ debian_rev := $(shell $(pf); echo $(debian_ver) | perl -pe 's/.*-//o')
 # before the last '-'
 debsrc_ver := $(shell $(pf); echo $(debian_ver) | perl -pe 's/-[^-]+$$//o')
 
+# Everything before the last '-' minus epoch
+deborig_ver := $(shell echo $(debsrc_ver) | sed 's/^[0-9]\+://')
+
 ######################################################################
 # Customizable variables
 
@@ -181,6 +184,7 @@ define deb_sub
     -e "s|\@DEBIAN_REV\@|$(deb_rev)|go;" \
     -e "s|\@UPSTREAM_VERSION\@|$(upstream_ver)|go;" \
     -e "s|\@DEBSRC_VERSION\@|$(debsrc_ver)|go;" \
+    -e "s|\@DEBORIG_VERSION\@|$(deborig_ver)|go;" \
     -e "s|\@MENU_VERSION\@|$(menu_ver)|go;" \
     -e "s|\@X_SUPPORT\@|$(xsupport)|go;" \
     -e "s|\@BIN_PRIORITY\@|$(bin_priority)|go;" \
@@ -195,6 +199,7 @@ check-vars:
        @echo "upstream_ver: $(upstream_ver)"
        @echo "debian_ver: $(debian_ver)"
        @echo "debsrc_ver: $(debsrc_ver)"
+       @echo "deborig_ver: $(deborig_ver)"
        @echo "debian_rev: $(debian_rev)"
        @echo "runtime_ver: $(runtime_ver)"
        @echo "major_ver: $(major_ver)"