debian/README.source

@@ -19,9 +19,9 @@ Guide To The X Strike Force Packages
 ------------------------------------
 
 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.
 

debian/changelog

+libdmx (1:1.1.4-2) UNRELEASED; urgency=medium
+
+  * control: Migrate to x11proto-dev.
+  * Switch to -dbgsym packages.
+  * control: Use dh_missing.
+  * Bump debhelper compat to 12.
+  * control: Bump policy to 4.4.0.
+  * Update README.source for salsa.
+  * watch: Updated link to upstream git repo.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 08 Aug 2019 10:20:56 +0300
+
 libdmx (1:1.1.4-1) unstable; urgency=medium
 
   * New upstream release

debian/compat

-7
+12

debian/control

@@ -4,17 +4,15 @@ Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Build-Depends:
  libx11-dev (>= 1:0.99.2),
- x11proto-dmx-dev (>= 1:2.2.99.1),
+ x11proto-dev,
  libxext-dev (>= 1:0.99.1),
- automake,
- libtool,
  xutils-dev (>= 1:7.5+4),
  pkg-config,
 # DEB_HOST_MULTIARCH
  dpkg-dev (>= 1.16),
 # misc:Pre-Depends
- debhelper (>= 8.1.3),
-Standards-Version: 3.9.3
+ debhelper (>= 12),
+Standards-Version: 4.4.0
 Vcs-Git: https://salsa.debian.org/xorg-team/lib/libdmx.git
 Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libdmx
 
@@ -43,36 +41,6 @@ Description: X11 Distributed Multihead extension library
  This module can be found at
  https://gitlab.freedesktop.org/xorg/lib/libdmx
 
-Package: libdmx1-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Multi-Arch: same
-Pre-Depends:
- ${misc:Pre-Depends},
-Depends:
- ${shlibs:Depends},
- ${misc:Depends},
- libdmx1 (= ${binary:Version}),
-Description: X11 Distributed Multihead library (debug package)
- libdmx is an interface to the DMX extension for X, which allows a single
- server to be set up as a proxy spanning multiple servers -- not unlike
- Xinerama across discrete physical machines.  It can be reconfigured
- on the fly to change the layout, and it is presented as a single logical
- display to clients.
- .
- libdmx allows clients to configure the layout of DMX servers by adding
- and removing screens, input devices, et al.
- .
- This package contains the debug versions of the library found in libdmx1.
- Non-developers likely have little use for this package.
- .
- More information about X.Org can be found at:
- <URL:https://www.X.org>
- .
- This module can be found at
- https://gitlab.freedesktop.org/xorg/lib/libdmx
-
 Package: libdmx-dev
 Section: libdevel
 Architecture: any
@@ -82,7 +50,7 @@ Depends:
  ${misc:Depends},
  libdmx1 (= ${binary:Version}),
  libx11-dev,
- x11proto-dmx-dev,
+ x11proto-dev,
 Replaces: x11proto-dmx-dev (<< 1:2.2.99.1)
 Description: X11 Distributed Multihead extension library (development headers)
  libdmx is an interface to the DMX extension for X, which allows a single

debian/rules

@@ -10,31 +10,8 @@
 # set this to the name of the main shlib's binary package
 PACKAGE = libdmx1
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-        NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-        MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-	confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
-	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
 %:
-	dh $@ --with autoreconf --parallel --builddirectory=build
-
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		--prefix=/usr --mandir=\$${prefix}/share/man \
-	             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-	             --infodir=\$${prefix}/share/info $(confflags) \
-		     --disable-silent-rules \
-		     $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
+	dh $@ --builddirectory=build
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -49,7 +26,8 @@ override_dh_auto_clean:
 	find -name Makefile.in -delete
 
 override_dh_install:
-	dh_install --fail-missing -X.la
+	find debian/tmp -name '*.la' -delete
+	dh_install
 
-override_dh_strip:
-	dh_strip --dbg-package=$(PACKAGE)-dbg
+override_dh_missing:
+	dh_missing --fail-missing

debian/watch

-#git=git://anongit.freedesktop.org/xorg/lib/libdmx
+#git=https://gitlab.freedesktop.org/xorg/lib/libdmx.git
 version=3
 opts=pgpsigurlmangle=s/$/.sig/ \
 https://xorg.freedesktop.org/releases/individual/lib/ libdmx-(.*)\.tar\.gz