Re: Freeze exception request: systemd 44-4
]] "Adam D. Barratt"
> On Wed, 2012-07-11 at 00:08 +0100, Adam D. Barratt wrote:
> [...]
> > >> On Sun, Jul 01, 2012 at 10:18:41AM +0200, Tollef Fog Heen wrote:
> > >> > systemd (44-4) unstable; urgency=low
> > >> >
> > >> > * Move diversion removal from postinst to preinst. Closes:
> > >> #679728
> > >> > * Prevent the journal from crashing when running out of disk
> > >> space.
> > >> > This is 499fb21 from upstream. Closes: #668047.
> > >> > * Stop mounting a tmpfs on /media. Closes: #665943
> [...]
> > Please go ahead; apologies for the delay in getting back to you.
>
> Any news on that?
Sorry about not making this upload earlier. I'd like to include a fix
for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680011 too, the
additional diff looks like:
diff --git a/Makefile.am b/Makefile.am
index eb58476..061a4f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2201,13 +2201,15 @@ XSLTPROC_FLAGS = \
--nonet \
--stringparam funcsynopsis.style ansi
+T=$(shell dpkg-parsechangelog | awk -F": " '$$1 == "Date" { print $$2 }')
+
XSLTPROC_PROCESS_MAN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+ TZ=UTC faketime "$(T)" $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
XSLTPROC_PROCESS_HTML = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
+ TZ=UTC faketime "$(T)" $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
man/%.1: man/%.xml
$(XSLTPROC_PROCESS_MAN)
diff --git a/debian/changelog b/debian/changelog
index 6622eb6..699669f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
systemd (44-4) unstable; urgency=low
+ [ Michael Biebl ]
+ * Override timestamp for man page building, thereby avoiding skew
+ between architectures which caused problems for multi-arch.
+ Closes: #680011
+
+ [ Tollef Fog Heen ]
* Move diversion removal from postinst to preinst. Closes: #679728
* Prevent the journal from crashing when running out of disk space.
This is 499fb21 from upstream. Closes: #668047.
diff --git a/debian/control b/debian/control
index 33717aa..70ca95b 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,8 @@ Build-Depends: debhelper (>= 9),
liblzma-dev,
libgee-dev,
gperf,
- libkmod-dev (>= 5)
+ libkmod-dev (>= 5),
+ faketime
Package: systemd
Architecture: linux-any
Ok to upload this? (I'm using dh-autoreconf, so no need to patch the
Makefile.in file.)
Cheers,
--
Tollef Fog Heen
UNIX is user friendly, it's just picky about who its friends are
Reply to: