Tags: patch pending Dear maintainer,
I've prepared an NMU for dist (versioned as 1:3.5-236-0.2) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards,
Boyuan Yang
diff -u dist-3.5-236/debian/changelog dist-3.5-236/debian/changelog
--- dist-3.5-236/debian/changelog
+++ dist-3.5-236/debian/changelog
@@ -1,3 +1,15 @@
+dist (1:3.5-236-0.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/dist.postinst: Fix wrong direction form.
+ (Closes: #908187)
+ * debian/rules: Explicitly provide tool path to avoid usrmerge
+ differences and make package reproducible. (Closes: #915910)
+ * debian/rules: Avoid manually setting DEB_HOST_MULTIARCH, use
+ /usr/share/dpkg/architecture.mk instead. (lintian warning)
+
+ -- Boyuan Yang <by...@debian.org> Sun, 23 Feb 2020 17:37:44 -0500
+
dist (1:3.5-236-0.1) unstable; urgency=medium
* Non-maintainer upload.
diff -u dist-3.5-236/debian/dist.postinst dist-3.5-236/debian/dist.postinst
--- dist-3.5-236/debian/dist.postinst
+++ dist-3.5-236/debian/dist.postinst
@@ -288,7 +288,7 @@
set_org_perms () {
chown root /etc/news/organization
- if grep news /etc/group 2>&1 >/dev/null ; then
+ if grep news /etc/group > /dev/null 2>&1 ; then
chgrp news /etc/news/organization
else
chgrp root /etc/news/organization
@@ -397,7 +397,7 @@
if test ! -d /etc/news ; then
mkdir /etc/news
chown root /etc/news
- if grep news /etc/group 2>&1 >/dev/null ; then
+ if grep news /etc/group > /dev/null 2>&1 ; then
chgrp news /etc/news
else
echo "darn, you do not have news in /etc/group"
diff -u dist-3.5-236/debian/rules dist-3.5-236/debian/rules
--- dist-3.5-236/debian/rules
+++ dist-3.5-236/debian/rules
@@ -23,8 +23,8 @@
patnotify patpost patftp patname patsnap patcol \
patclean patindex
-DPKG_ARCH := dpkg-architecture
-export DEB_HOST_MULTIARCH := $(shell $(DPKG_ARCH) $(ha)
-qDEB_HOST_MULTIARCH)
+# For DEB_HOST_MULTIARCH
+include /usr/share/dpkg/architecture.mk
%:
dh $@
@@ -35,15 +35,19 @@
touch .config/nomail && \
sh ./Configure \
-de \
- -D prefix=$(PREFIX) \
+ -D prefix=/usr \
-D orgname=/etc/news/organization \
-D myhostname=localhost \
-D mydomain=localdomain \
-D defeditor=/usr/ae \
- -D privlib=/usr/share/$(package) \
+ -D privlib=/usr/share/$(package) \
-D pager=/bin/more \
-D mansrc=/usr/share/man/ \
-D cf_email='$(email)' \
+ -D grep=/bin/grep \
+ -D sed=/bin/sed \
+ -D cat=/bin/cat \
+ -D zcat=/bin/zcat \
-D d_berknames='define'
signature.asc
Description: This is a digitally signed message part
