[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/lib/libdmx][debian-unstable] 7 commits: control: Migrate to x11proto-dev.

Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libdmx

Commits:

6 changed files:

Changes:

  • debian/README.source
    ... ... @@ -19,9 +19,9 @@ Guide To The X Strike Force Packages
    19 19 
     ------------------------------------
    20 20
    21 21 
     The X Strike Force team maintains X packages in git repositories on
    22 
    -git.debian.org in the pkg-xorg subdirectory. Most upstream packages
    22 
    +salsa.debian.org in the xorg-team group. Most upstream packages
    23 23 
     are actually maintained in git repositories as well, so they often
    24 
    -just need to be pulled into git.debian.org in a "upstream-*" branch.
    24 
    +just need to be pulled into salsa.debian.org in a "upstream-*" branch.
    25 25 
     Otherwise, the upstream sources are manually installed in the Debian
    26 26 
     git repository.
    27 27

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

  • debian/compat
    1 
    -7
    1 
    +12

  • debian/control
    ... ... @@ -4,17 +4,15 @@ Priority: optional
    4 4 
     Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    5 5 
     Build-Depends:
    6 6 
      libx11-dev (>= 1:0.99.2),
    7 
    - x11proto-dmx-dev (>= 1:2.2.99.1),
    7 
    + x11proto-dev,
    8 8 
      libxext-dev (>= 1:0.99.1),
    9 
    - automake,
    10 
    - libtool,
    11 9 
      xutils-dev (>= 1:7.5+4),
    12 10 
      pkg-config,
    13 11 
     # DEB_HOST_MULTIARCH
    14 12 
      dpkg-dev (>= 1.16),
    15 13 
     # misc:Pre-Depends
    16 
    - debhelper (>= 8.1.3),
    17 
    -Standards-Version: 3.9.3
    14 
    + debhelper (>= 12),
    15 
    +Standards-Version: 4.4.0
    18 16 
     Vcs-Git: https://salsa.debian.org/xorg-team/lib/libdmx.git
    19 17 
     Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libdmx
    20 18
    ... ... @@ -43,36 +41,6 @@ Description: X11 Distributed Multihead extension library
    43 41 
      This module can be found at
    44 42 
      https://gitlab.freedesktop.org/xorg/lib/libdmx
    45 43
    46 
    -Package: libdmx1-dbg
    47 
    -Section: debug
    48 
    -Architecture: any
    49 
    -Priority: extra
    50 
    -Multi-Arch: same
    51 
    -Pre-Depends:
    52 
    - ${misc:Pre-Depends},
    53 
    -Depends:
    54 
    - ${shlibs:Depends},
    55 
    - ${misc:Depends},
    56 
    - libdmx1 (= ${binary:Version}),
    57 
    -Description: X11 Distributed Multihead library (debug package)
    58 
    - libdmx is an interface to the DMX extension for X, which allows a single
    59 
    - server to be set up as a proxy spanning multiple servers -- not unlike
    60 
    - Xinerama across discrete physical machines.  It can be reconfigured
    61 
    - on the fly to change the layout, and it is presented as a single logical
    62 
    - display to clients.
    63 
    - .
    64 
    - libdmx allows clients to configure the layout of DMX servers by adding
    65 
    - and removing screens, input devices, et al.
    66 
    - .
    67 
    - This package contains the debug versions of the library found in libdmx1.
    68 
    - Non-developers likely have little use for this package.
    69 
    - .
    70 
    - More information about X.Org can be found at:
    71 
    - <URL:https://www.X.org>
    72 
    - .
    73 
    - This module can be found at
    74 
    - https://gitlab.freedesktop.org/xorg/lib/libdmx
    75 
    -
    76 44 
     Package: libdmx-dev
    77 45 
     Section: libdevel
    78 46 
     Architecture: any
    ... ... @@ -82,7 +50,7 @@ Depends:
    82 50 
      ${misc:Depends},
    83 51 
      libdmx1 (= ${binary:Version}),
    84 52 
      libx11-dev,
    85 
    - x11proto-dmx-dev,
    53 
    + x11proto-dev,
    86 54 
     Replaces: x11proto-dmx-dev (<< 1:2.2.99.1)
    87 55 
     Description: X11 Distributed Multihead extension library (development headers)
    88 56 
      libdmx is an interface to the DMX extension for X, which allows a single

  • debian/rules
    ... ... @@ -10,31 +10,8 @@
    10 10 
     # set this to the name of the main shlib's binary package
    11 11 
     PACKAGE = libdmx1
    12 12
    13 
    -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
    14 
    -        NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
    15 
    -        MAKEFLAGS += -j$(NUMJOBS)
    16 
    -endif
    17 
    -
    18 
    -DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
    19 
    -DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
    20 
    -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
    21 
    -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
    22 
    -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
    23 
    -	confflags += --build=$(DEB_HOST_GNU_TYPE)
    24 
    -else
    25 
    -	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
    26 
    -endif
    27 
    -
    28 13 
     %:
    29 
    -	dh $@ --with autoreconf --parallel --builddirectory=build
    30 
    -
    31 
    -override_dh_auto_configure:
    32 
    -	dh_auto_configure -- \
    33 
    -		--prefix=/usr --mandir=\$${prefix}/share/man \
    34 
    -	             --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
    35 
    -	             --infodir=\$${prefix}/share/info $(confflags) \
    36 
    -		     --disable-silent-rules \
    37 
    -		     $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
    14 
    +	dh $@ --builddirectory=build
    38 15
    39 16 
     override_dh_auto_clean:
    40 17 
     	dh_auto_clean
    ... ... @@ -49,7 +26,8 @@ override_dh_auto_clean:
    49 26 
     	find -name Makefile.in -delete
    50 27
    51 28 
     override_dh_install:
    52 
    -	dh_install --fail-missing -X.la
    29 
    +	find debian/tmp -name '*.la' -delete
    30 
    +	dh_install
    53 31
    54 
    -override_dh_strip:
    55 
    -	dh_strip --dbg-package=$(PACKAGE)-dbg
    32 
    +override_dh_missing:
    33 
    +	dh_missing --fail-missing

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

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: