Control: tags -1 + patch  pending

Dear maintainer,

I've prepared an NMU for minicom (versioned as 2.7.1-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru minicom-2.7.1/debian/changelog minicom-2.7.1/debian/changelog
--- minicom-2.7.1/debian/changelog      2017-08-13 11:25:34.000000000 -0400
+++ minicom-2.7.1/debian/changelog      2019-12-22 21:06:26.000000000 -0500
@@ -1,3 +1,16 @@
+minicom (2.7.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control:
+    + Update project homepage on salsa.debian.org. (Closes: #900092)
+    + Add missing build-dependency debhelper (with compat level
+      of 12).
+  * debian/rules:
+    + Use buildflags.mk and buildtools.mk to properly set CFLAGS
+      and $(STRIP). This fixes FTCBFS. (Closes: #842896)
+
+ -- Boyuan Yang <[email protected]>  Sun, 22 Dec 2019 21:06:26 -0500
+
 minicom (2.7.1-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru minicom-2.7.1/debian/control minicom-2.7.1/debian/control
--- minicom-2.7.1/debian/control        2017-08-13 11:17:46.000000000 -0400
+++ minicom-2.7.1/debian/control        2019-12-22 20:57:08.000000000 -0500
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Martin A. Godisch <[email protected]>
 Uploaders: Jordi Mallach <[email protected]>
-Build-Depends: autotools-dev, gettext, libncurses5-dev
+Build-Depends: debhelper-compat (= 12), gettext, libncurses5-dev
 Standards-Version: 4.0.1
-Homepage: https://alioth.debian.org/projects/minicom/
+Homepage: https://salsa.debian.org/minicom-team/minicom
 
 Package: minicom
 Architecture: any
diff -Nru minicom-2.7.1/debian/rules minicom-2.7.1/debian/rules
--- minicom-2.7.1/debian/rules  2017-08-13 11:25:34.000000000 -0400
+++ minicom-2.7.1/debian/rules  2019-12-22 21:06:24.000000000 -0500
@@ -2,6 +2,12 @@
 #
 # $Id: rules,v 1.15.2.5 2005/11/05 12:01:25 godisch Exp $
 
+DPKG_EXPORT_BUILDFLAGS = 1
+DPKG_EXPORT_BUILDTOOLS = 1
+include /usr/share/dpkg/default.mk
+include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/buildtools.mk
+
 BUILDDIR = debian/minicom
 DEBDIR   = $(BUILDDIR)/DEBIAN
 DOCDIR   = $(BUILDDIR)/usr/share/doc/minicom
@@ -15,14 +21,6 @@
        CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-export CFLAGS
-
 clean:
        $(testdir)
        rm -f configure-stamp build-stamp
@@ -61,7 +59,7 @@
        $(MAKE) DESTDIR=$(CURDIR)/debian/minicom install
        chmod -R go=u-w $(BUILDDIR)
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       cd $(BUILDDIR)/usr/bin && strip -R .comment -R .note ascii-xfr minicom
runscript
+       cd $(BUILDDIR)/usr/bin && $(STRIP) -R .comment -R .note ascii-xfr
minicom runscript
 endif
        install -p -D -m 0644 debian/desktop
$(BUILDDIR)/usr/share/applications/minicom.desktop
        find $(BUILDDIR)/usr/share/man -type f -print0 | xargs -0 gzip -9

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to