Control: tags -1 + pending
Control: tags 858469 + pending
Hi,
2016-10-15 09:49 Helmut Grohne:
Package: xorg-docs-core
Version: 1:1.7.1-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
Control: affects -1 + src:xterm
xterm cannot be cross built from source, because its build dependency on
xorg-docs-core is unsatisfiable. In general, Architecture: all packages
that are not marked Multi-Arch: foreign cannot satisfy cross
Build-Depends at all. I propose marking it Multi-Arch: foreign, because
it is Architecture: all, has no maintainer scripts or depdendencies. The
same holds for xorg-docs. Please consider applying the attached patch.
I prepared an NMU with this fix, plus the fix for the broken symlink in
#858469, plus a change in the VCS from 2016 that has not been released
yet.
debdiff attached.
I uploaded to delayed/15, but if you want me to cancel or if it's OK to
change it to happen sooner, please let me know.
Cheers.
--
Manuel A. Fernandez Montecelo <manuel.montez...@gmail.com>
diff -u xorg-docs-1.7.1/debian/changelog xorg-docs-1.7.1/debian/changelog
--- xorg-docs-1.7.1/debian/changelog
+++ xorg-docs-1.7.1/debian/changelog
@@ -1,3 +1,21 @@
+xorg-docs (1:1.7.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Manuel A. Fernandez Montecelo ]
+ * Remove d/xorg-docs.links (Closes: #858469)
+ - /usr/share/X11/doc was broken for years (the file was last modified
+ in 2010) without anybody complaining, so rather than fixing the
+ destination it's probably better to just remove this legacy bit
+
+ [ Julien Cristau ]
+ * Switch xorg.freedesktop.org URLs in packaging to https.
+
+ [ Helmut Grohne ]
+ * Mark all packages Multi-Arch: foreign. (Closes: #840813)
+
+ -- Manuel A. Fernandez Montecelo <m...@debian.org> Fri, 29 Sep 2017 00:05:13
+0200
+
xorg-docs (1:1.7.1-1) unstable; urgency=medium
* Team upload.
diff -u xorg-docs-1.7.1/debian/control xorg-docs-1.7.1/debian/control
--- xorg-docs-1.7.1/debian/control
+++ xorg-docs-1.7.1/debian/control
@@ -24,6 +24,7 @@
Depends: ${misc:Depends}
Suggests: xorg-docs
Replaces: xorg-docs ( << 1:1.4-5 )
+Multi-Arch: foreign
Description: Core documentation for the X.org X Window System
This package contains core documentation for the X.org X Window
System. This currently includes only a set of manpages which are
@@ -34,6 +35,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: xprt-xprintorg (<= 1:0.1.0.alpha1-10)
Replaces: xspecs (<= 1:1.2+git20061105-2), xprt-xprintorg (<=
1:0.1.0.alpha1-10)
+Multi-Arch: foreign
Description: Miscellaneous documentation for the X.org X Window System
This package contains various documents on the X.org X Window System
including the release notes for the current version and instructions on
diff -u xorg-docs-1.7.1/debian/copyright xorg-docs-1.7.1/debian/copyright
--- xorg-docs-1.7.1/debian/copyright
+++ xorg-docs-1.7.1/debian/copyright
@@ -1,5 +1,5 @@
This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/doc/.
+https://xorg.freedesktop.org/releases/individual/doc/.
Packager's note: Taken from the generated general/License.txt
diff -u xorg-docs-1.7.1/debian/watch xorg-docs-1.7.1/debian/watch
--- xorg-docs-1.7.1/debian/watch
+++ xorg-docs-1.7.1/debian/watch
@@ -4 +4 @@
-http://xorg.freedesktop.org/releases/individual/doc/ xorg-docs-(.*)\.tar\.gz
+https://xorg.freedesktop.orgreleases/individual/doc/ xorg-docs-(.*)\.tar\.gz
reverted:
--- xorg-docs-1.7.1/debian/xorg-docs.links
+++ xorg-docs-1.7.1.orig/debian/xorg-docs.links
@@ -1 +0,0 @@
-usr/share/doc/xorg-docs/docs usr/share/X11/doc
