Tags: patch pending
Dear maintainer,
I've prepared an NMU for porg (versioned as 2:0.10-1.2) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards,
Boyuan Yang
diff -Nru porg-0.10/debian/changelog porg-0.10/debian/changelog
--- porg-0.10/debian/changelog 2017-05-27 18:11:56.000000000 -0400
+++ porg-0.10/debian/changelog 2020-02-25 16:06:41.000000000 -0500
@@ -1,3 +1,16 @@
+porg (2:0.10-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control:
+ - Drop transitional package paco. (Closes: #940759)
+ - Drop transitional package gpaco. (Closes: #940758)
+ * debian/rules:
+ + Explicitly pass sed path to configure. This fixes
+ reproducible build on merged-usr vs non-merged systems.
+ (Closes: #915846)
+
+ -- Boyuan Yang <by...@debian.org> Tue, 25 Feb 2020 16:06:41 -0500
+
porg (2:0.10-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru porg-0.10/debian/control porg-0.10/debian/control
--- porg-0.10/debian/control 2016-07-20 17:21:10.000000000 -0400
+++ porg-0.10/debian/control 2020-02-25 16:03:33.000000000 -0500
@@ -38,25 +38,3 @@
manipulating the installed packages in a more comfortable way.
.
This package is a complete replacement for the deprecated 'gpaco' package.
-
-Package: paco
-Architecture: all
-Depends: porg, ${misc:Depends}
-Section: oldlibs
-Description: Transitional package to pull in porg
- The paco program has been renamed to porg. This is the transitional dummy
- package to get upgrading systems to install porg.
- .
- You can safely remove this dummy package once nothing depends on it
- anymore.
-
-Package: gpaco
-Architecture: all
-Depends: grop, ${misc:Depends}
-Section: oldlibs
-Description: Transitional package to pull in grop
- The gpaco program has been renamed to grop. This is the transitional dummy
- package to get upgrading systems to intall grop.
- .
- You can safely remove this dummy package once nothing depends on it
- anymore.
diff -Nru porg-0.10/debian/rules porg-0.10/debian/rules
--- porg-0.10/debian/rules 2017-05-27 18:11:56.000000000 -0400
+++ porg-0.10/debian/rules 2020-02-25 16:06:39.000000000 -0500
@@ -14,4 +14,9 @@
dh $@ --with autotools-dev
override_dh_auto_configure:
- dh_auto_configure -- --with-porg-logdir=/var/lib/porg --
libdir=/usr/lib/porg
+ # Set SED variable for reproducibility
+ # See https://bugs.debian.org/915846
+ dh_auto_configure -- \
+ SED=/bin/sed \
+ --with-porg-logdir=/var/lib/porg \
+ --libdir=/usr/lib/porg
