Bug#915543: xcb-util-wm: diff for NMU version 0.4.1-1.1

[Boyuan Yang]

Package: xcb-util-wm
Version: 0.4.1-1
Severity: normal
Tags: patch pending

Dear maintainer,

I noticed that package xcb-util-wm hasn't seen any upload since 2014.
Since I'm going to deal with some new packages that directly uses
xcb-util-wm, I think it might be a good idea to make an upload before
Buster freeze and rebuild my packages on top of newly-built xcb-util-wm.

I've prepared an NMU for xcb-util-wm (versioned as 0.4.1-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

This NMU didn't touch anything about packaging; it was merely some
metadata updates and keep in sync with downstream Ubuntu's patched
version. Please let me know ASAP if you have any doubts. After this NMU
is accepted, I'd be glad to provide a Merge Request on Salsa git repo
to reflect this NMU-ed version.

Regards.

diff -Nru xcb-util-wm-0.4.1/debian/changelog xcb-util-wm-0.4.1/debian/changelog
--- xcb-util-wm-0.4.1/debian/changelog 2014-02-19 07:40:27.000000000 -0500
+++ xcb-util-wm-0.4.1/debian/changelog 2018-12-04 10:08:38.000000000 -0500
@@ -1,3 +1,19 @@
+xcb-util-wm (0.4.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Steve Langasek ]
+ * Use dh-autoreconf, to support rebuilding on new architectures.
+
+ [ Boyuan Yang ]
+ * debian/control,copyright: Use HTTPS url when possible.
+ * debian/control:
+ + Update Vcs-Git and Vcs-Browser fields to use git repo under
+ Salsa Xorg Team.
+ + Replace obsolete package priority "extra" with "optional".
+
+ -- Boyuan Yang <***@debian.org> Tue, 04 Dec 2018 10:08:38 -0500
+
xcb-util-wm (0.4.1-1) unstable; urgency=medium

* New upstream release.
diff -Nru xcb-util-wm-0.4.1/debian/control xcb-util-wm-0.4.1/debian/control
--- xcb-util-wm-0.4.1/debian/control 2014-02-19 07:33:16.000000000 -0500
+++ xcb-util-wm-0.4.1/debian/control 2018-12-04 10:08:36.000000000 -0500
@@ -1,11 +1,12 @@
Source: xcb-util-wm
Section: libdevel
-Priority: extra
+Priority: optional
Maintainer: Debian X Strike Force <debian-***@lists.debian.org>
Uploaders: Julien Danjou <***@debian.org>,
Arnaud Fontaine <***@debian.org>
Build-Depends: cdbs (>= 0.4.93~),
debhelper (>= 8.1.3),
+ dh-autoreconf,
libxcb1-dev (>= 1.6),
pkg-config,
m4,
@@ -15,9 +16,9 @@
automake,
xutils-dev (>= 1:7.7~1~)
Standards-Version: 3.9.3
-Homepage: http://xcb.freedesktop.org
-Vcs-Git: git://anonscm.debian.org/pkg-xorg/lib/xcb-util-wm.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xorg/lib/xcb-util-wm.git
+Homepage: https://xcb.freedesktop.org
+Vcs-Git: https://salsa.debian.org/xorg-team/lib/xcb-util-wm.git
+Vcs-Browser: https://salsa.debian.org/xorg-team/lib/xcb-util-wm

Package: libxcb-icccm4
Section: libs
diff -Nru xcb-util-wm-0.4.1/debian/copyright xcb-util-wm-0.4.1/debian/copyright
--- xcb-util-wm-0.4.1/debian/copyright 2014-02-19 07:01:42.000000000 -0500
+++ xcb-util-wm-0.4.1/debian/copyright 2018-12-04 10:05:18.000000000 -0500
@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: xcb-util-wm
Upstream-Contact: XCB Mailing List <***@lists.freedesktop.org>
-Source: http://xcb.freedesktop.org
+Source: https://xcb.freedesktop.org

Files: *
Copyright: 2007-2008 Vincent Torri <***@univ-evry.fr>
diff -Nru xcb-util-wm-0.4.1/debian/rules xcb-util-wm-0.4.1/debian/rules
--- xcb-util-wm-0.4.1/debian/rules 2014-02-19 07:28:34.000000000 -0500
+++ xcb-util-wm-0.4.1/debian/rules 2018-12-04 10:04:12.000000000 -0500
@@ -3,6 +3,7 @@
DEB_DH_INSTALL_SOURCEDIR=debian/tmp

include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/class/autotools.mk

DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)