diff -u libxinerama-1.1.4/debian/README.source libxinerama-1.1.4/debian/README.source --- libxinerama-1.1.4/debian/README.source +++ libxinerama-1.1.4/debian/README.source @@ -19,9 +19,9 @@ ------------------------------------ The X Strike Force team maintains X packages in git repositories on -git.debian.org in the pkg-xorg subdirectory. Most upstream packages +salsa.debian.org in the xorg-team group. Most upstream packages are actually maintained in git repositories as well, so they often -just need to be pulled into git.debian.org in a "upstream-*" branch. +just need to be pulled into salsa.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. @@ -50,24 +49,0 @@ - -quilt is actually invoked by the Debian X packaging through a larger -set of scripts called XSFBS. XSFBS brings some other X specific -features such as managing dependencies and conflicts due to the video -and input driver ABIs. -XSFBS itself is maintained in a separate repository at - git://git.debian.org/pkg-xorg/xsfbs.git -and it is pulled inside the other Debian X repositories when needed. - -The XSFBS patching system requires a build dependency on quilt. Also -a dependency on $(STAMP_DIR)/patch has to be added to debian/rules -so that the XSFBS patching occurs before the actual build. So the -very first target of the build (likely the one running autoreconf) -should depend on $(STAMP_DIR)/patch. It should also not depend on -anything so that parallel builds are correctly supported (nothing -should probably run while patching is being done). And finally, the -clean target should depend on the xsfclean target so that patches -are unapplied on clean. - -When the upstream sources contain some DFSG-nonfree files, they are -listed in text files in debian/prune/ in the "debian-*" branch of -the Debian repository. XSFBS' scripts then take care of removing -these listed files during the build so as to generate a modified -DFSG-free .orig.tar.gz tarball. diff -u libxinerama-1.1.4/debian/changelog libxinerama-1.1.4/debian/changelog --- libxinerama-1.1.4/debian/changelog +++ libxinerama-1.1.4/debian/changelog @@ -1,20 +1,12 @@ -libxinerama (2:1.1.4-2build3) impish; urgency=medium +libxinerama (2:1.1.4-3) unstable; urgency=medium - * No-change rebuild to build packages with zstd compression. + * control: Migrate to x11proto-dev. (Closes: #969068) + * control: Migrate to debhelper-compat, bump to 13. + * control: Bump policy to 4.6.0. + * Update README.source for salsa. + * watch: Updated link to upstream git repo. - -- Matthias Klose Thu, 07 Oct 2021 12:19:40 +0200 - -libxinerama (2:1.1.4-2build2) hirsute; urgency=medium - - * No-change rebuild to drop the udeb package. - - -- Matthias Klose Fri, 26 Feb 2021 08:11:28 +0100 - -libxinerama (2:1.1.4-2build1) hirsute; urgency=medium - - * No-change rebuild to drop the udeb package. - - -- Matthias Klose Mon, 22 Feb 2021 10:35:11 +0100 + -- Timo Aaltonen Wed, 02 Feb 2022 16:24:34 +0200 libxinerama (2:1.1.4-2) unstable; urgency=high reverted: --- libxinerama-1.1.4/debian/compat +++ libxinerama-1.1.4.orig/debian/compat @@ -1 +0,0 @@ -11 diff -u libxinerama-1.1.4/debian/control libxinerama-1.1.4/debian/control --- libxinerama-1.1.4/debian/control +++ libxinerama-1.1.4/debian/control @@ -3,15 +3,15 @@ Priority: optional Maintainer: Debian X Strike Force Build-Depends: - debhelper (>= 11), + debhelper-compat (= 13), # dpkg-buildflags --export=configure dpkg-dev (>= 1.16.1), libx11-dev (>= 2:1.3.3-2), libxext-dev (>= 2:1.1.1-3), - x11proto-xinerama-dev (>= 1.2), + x11proto-dev, pkg-config, xutils-dev (>= 1:7.5+4), -Standards-Version: 4.2.0 +Standards-Version: 4.6.0 Vcs-Git: https://salsa.debian.org/xorg-team/lib/libxinerama.git Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libxinerama @@ -53,8 +53,7 @@ libxinerama1 (= ${binary:Version}), libx11-dev, libxext-dev, - x11proto-xinerama-dev (>= 1.2) -Replaces: x11proto-xinerama-dev (<< 1.2) + x11proto-dev, Description: X11 Xinerama extension library (development headers) libXinerama provides an X Window System client interface to the XINERAMA extension to the X protocol. diff -u libxinerama-1.1.4/debian/watch libxinerama-1.1.4/debian/watch --- libxinerama-1.1.4/debian/watch +++ libxinerama-1.1.4/debian/watch @@ -1,4 +1,4 @@ -#git=git://anongit.freedesktop.org/xorg/lib/libXinerama +#git=https://gitlab.freedesktop.org/xorg/lib/libXinerama version=3 opts=pgpsigurlmangle=s/$/.sig/ \ http://xorg.freedesktop.org/releases/individual/lib/ libXinerama-(.*)\.tar\.gz