Hi Julien,
2017-10-01 22:50 Julien Cristau:
On Fri, Sep 29, 2017 at 00:21:59 +0200, Manuel A. Fernandez Montecelo wrote:
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.
FWIW I don't think any of these changes are worth an upload. They're
probably not worth removing your upload either, except if they're not in
git they'll be lost the next time somebody touches this. So please
either cancel the NMU or provide a git tree we can pull from.
Thanks for taking a look and providing feedback.
I agree that the changes are not very important in general from the
point of view of the package.
However, they are somehwat important for cross-building and rebootstrap,
and to bring up new architectures, and since the last update was a
couple of years ago, maybe we'll go for a few months/years without
updates...
Anyway, I attach the individual patches that can be applied, if you want
me to provide the git tree I'll try to look tomorrow with more calm.
Cheers.
--
Manuel A. Fernandez Montecelo <manuel.montez...@gmail.com>
>From 10c5fac7492a25bdd3aba50d60235848793d1829 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <hel...@subdivi.de>
Date: Fri, 29 Sep 2017 00:02:40 +0200
Subject: [PATCH 1/3] Mark all packages Multi-Arch: foreign. (Closes: #840813)
---
debian/changelog | 6 +++++-
debian/control | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index b2259cf..9c05a1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-xorg-docs (1:1.7.1-2) UNRELEASED; urgency=medium
+xorg-docs (1:1.7.1-1.1) UNRELEASED; urgency=medium
+ [ Julien Cristau ]
* Switch xorg.freedesktop.org URLs in packaging to https.
+ [ Helmut Grohne ]
+ * Mark all packages Multi-Arch: foreign. (Closes: #840813)
+
-- Julien Cristau <jcris...@debian.org> Sun, 21 Aug 2016 19:36:18 +0200
xorg-docs (1:1.7.1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index fda9339..cbf99f3 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Architecture: all
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 @@ Architecture: all
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
--
2.14.2
>From 250144605906f534b621b0951b62fd71971ea4b9 Mon Sep 17 00:00:00 2001
From: "Manuel A. Fernandez Montecelo" <manuel.montez...@gmail.com>
Date: Fri, 29 Sep 2017 00:04:39 +0200
Subject: [PATCH 2/3] 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
---
debian/changelog | 8 ++++++++
debian/xorg-docs.links | 1 -
2 files changed, 8 insertions(+), 1 deletion(-)
delete mode 100644 debian/xorg-docs.links
diff --git a/debian/changelog b/debian/changelog
index 9c05a1b..56c4de5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
xorg-docs (1:1.7.1-1.1) UNRELEASED; 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.
diff --git a/debian/xorg-docs.links b/debian/xorg-docs.links
deleted file mode 100644
index fe2c93c..0000000
--- a/debian/xorg-docs.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/xorg-docs/docs usr/share/X11/doc
--
2.14.2
>From d1d5cfd3eb4ee3ac2596b3728e99347f6354fd3b Mon Sep 17 00:00:00 2001
From: "Manuel A. Fernandez Montecelo" <manuel.montez...@gmail.com>
Date: Fri, 29 Sep 2017 00:05:38 +0200
Subject: [PATCH 3/3] Release to unstable
---
debian/changelog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 56c4de5..cb2f04a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-docs (1:1.7.1-1.1) UNRELEASED; urgency=medium
+xorg-docs (1:1.7.1-1.1) unstable; urgency=medium
* Non-maintainer upload.
@@ -14,7 +14,7 @@ xorg-docs (1:1.7.1-1.1) UNRELEASED; urgency=medium
[ Helmut Grohne ]
* Mark all packages Multi-Arch: foreign. (Closes: #840813)
- -- Julien Cristau <jcris...@debian.org> Sun, 21 Aug 2016 19:36:18 +0200
+ -- 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
--
2.14.2
