more parts of the backports: sarge/etch

diff --git a/debian/control.in b/debian/control.in
index 7a3fb57..665c17a 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,7 @@ Source: jupp
 Section: editors
 Priority: optional
 Maintainer: Thorsten Glaser <tg@mirbsd.de>
-Homepage: https://www.mirbsd.org/jupp.htm
+Homepage: @HP@MODERN@
 Build-Depends: @@DSC_DEPS@@
 Standards-Version: 4.1.2
 VCS-git: https://anonscm.debian.org/git/collab-maint/jupp.git -b master
@@ -46,6 +46,8 @@ Description: user friendly full screen text editor
  with the Debian joe package, activated. The resource files and executable
  links and menu entries for the other flavours are still available, though,
  in the joe-jupp package.
+ .@HP@DOT@
+  Homepage: @HP@OLD@
 
 Package: joe-jupp
 @PRIO@EXTRA@
@@ -61,3 +63,5 @@ Description: reimplement the joe Debian package using jupp
  joe flavour, supports SELinux context copying (on Debian systems with
  the Linux kernel), and has many bugs fixed and makes some of jupps new
  features available to the joe, jstar, jmacs, jpico and rjoe flavours.
+ .@HP@DOT@
+  Homepage: @HP@OLD@

diff --git a/debian/rules b/debian/rules
index 6ef7858..fd351d9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -121,6 +121,8 @@ EXTRA_LDFLAGS=              -Wl,--as-needed
 DEBHELPER_VERSION:=    9
 DSF:=                  3.0 (quilt)
 SUBST_EP:=             -e '/@PRIO@EXTRA@/d'
+HOMEPAGE:=             https://www.mirbsd.org/jupp.htm
+SUBST_HP:=             -e '/@HP@DOT@/d' -e '/@HP@OLD@/d' -e 's\ 1@HP@MODERN@\ 1${HOMEPAGE}\ 1'
 DSC_DEPS:=             debhelper (>= ${DEBHELPER_VERSION})
 SUBST_VARS+=           DSC_DEPS
 
@@ -162,7 +164,7 @@ ifneq (,$(findstring debug,${DEB_BUILD_OPTIONS}))
 EXTRA_CFLAGS+=         -g3
 endif
 
-ifneq (,$(findstring lenny,${DEB_BUILD_OPTIONS}))
+ifneq (,$(findstring lenny,${DEB_BUILD_OPTIONS})$(findstring sarge,${DEB_BUILD_OPTIONS}))
 DEBHELPER_VERSION:=    5
 DSF:=                  1.0
 SUBST_EP:=             -e 's/@PRIO@EXTRA@/Priority: extra/'
@@ -170,6 +172,12 @@ SELINUX_ARCHS:=            !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386
 BREAKS:=               Conflicts
 endif
 
+ifneq (,$(findstring sarge,${DEB_BUILD_OPTIONS}))
+DEBHELPER_VERSION:=    4
+SUBST_HP:=             -e '/@HP@MODERN@/d' -e '/^VCS-[gB][ir][to][:w]/d' \
+                       -e 's/@HP@DOT@//' -e 's\ 1@HP@OLD@\ 1${HOMEPAGE}\ 1'
+endif
+
 ifneq (,$(wildcard /usr/share/dpkg/buildflags.mk))
 # dpkg-dev (>= 1.16.1~)
 DEB_CFLAGS_MAINT_APPEND=${EXTRA_CFLAGS}
@@ -273,7 +281,7 @@ debian/.control_stamp:
        fi)
        echo '${DSF}' >debian/source/format
        echo ${DEBHELPER_VERSION} >debian/compat
-       sed ${SUBST_EP} \
+       sed ${SUBST_EP} ${SUBST_HP} \
            $(foreach v,${SUBST_VARS},-e 's\ 1@@'$(call shellescape,$v)'@@\ 1'$(call shellescape,$(strip ${$v}))'\ 1') \
            <debian/control.in >debian/.gencontrol_stamp
        : bail out if these differ: in those cases,