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

[Git][xorg-team/app/x11-session-utils][debian-unstable] 6 commits: control: Build-depend on x11proto-dev instead of -core-dev.



Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / app / x11-session-utils

Commits:

4 changed files:

Changes:

  • debian/changelog
    1
    +x11-session-utils (7.7+4) unstable; urgency=medium
    
    2
    +
    
    3
    +  [ Timo Aaltonen ]
    
    4
    +  * control: Build-depend on x11proto-dev instead of -core-dev.
    
    5
    +  * control, rules: Use debhelper-compat, bump to 12, run autoreconf.
    
    6
    +  * control: Bump policy to 4.5.0.
    
    7
    +  * Use source format 1.0.
    
    8
    +
    
    9
    +  [ Michael Gilbert ]
    
    10
    +  * Remove unneeded cpp dependency (closes: #793174).
    
    11
    +
    
    12
    + -- Timo Aaltonen <tjaalton@debian.org>  Sat, 29 Feb 2020 08:08:03 +0200
    
    13
    +
    
    1 14
     x11-session-utils (7.7+3) unstable; urgency=medium
    
    2 15
     
    
    3 16
       * Update Vcs-* URLs for move to salsa.
    

  • debian/compat deleted
    1
    -9

  • debian/control
    ... ... @@ -4,8 +4,7 @@ Priority: optional
    4 4
     Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    
    5 5
     Build-Depends:
    
    6 6
      dpkg-dev (>= 1.16.1),
    
    7
    - debhelper (>= 9),
    
    8
    - autotools-dev,
    
    7
    + debhelper-compat (= 12),
    
    9 8
      pkg-config,
    
    10 9
      libice-dev,
    
    11 10
      libsm-dev,
    
    ... ... @@ -13,7 +12,7 @@ Build-Depends:
    13 12
      libxmuu-dev,
    
    14 13
      libxt-dev (>= 1:1.0.0),
    
    15 14
      libx11-dev,
    
    16
    - x11proto-core-dev,
    
    15
    + x11proto-dev,
    
    17 16
      quilt,
    
    18 17
      xutils-dev (>= 1:7.5+4),
    
    19 18
     # Reasons for build-depends:
    
    ... ... @@ -24,7 +23,7 @@ Build-Depends:
    24 23
     # smproxy: libxt-dev, libxmuu-dev, libsm-dev
    
    25 24
     # xsm: openssh-client | ssh, libxaw7-dev, libxt-dev, libsm-dev
    
    26 25
     #      libice-dev, libx11-dev
    
    27
    -Standards-Version: 3.9.2
    
    26
    +Standards-Version: 4.5.0
    
    28 27
     Vcs-Git: https://salsa.debian.org/xorg-team/app/x11-session-utils.git
    
    29 28
     Vcs-Browser: https://salsa.debian.org/xorg-team/app/x11-session-utils
    
    30 29
     
    
    ... ... @@ -33,7 +32,6 @@ Architecture: any
    33 32
     Depends:
    
    34 33
      ${shlibs:Depends},
    
    35 34
      ${misc:Depends},
    
    36
    - cpp,
    
    37 35
     Description: X session utilities
    
    38 36
      This package provides the X session manager and related tools:
    
    39 37
       - rstart;
    

  • debian/rules
    ... ... @@ -17,7 +17,16 @@ CONFIG_STAMPS = $(addprefix $(STAMP_DIR)/configure-, $(SUBDIRS))
    17 17
     BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS))
    
    18 18
     
    
    19 19
     %:
    
    20
    -	dh $@ --with quilt,autotools-dev --parallel
    
    20
    +	dh $@ --with quilt
    
    21
    +
    
    22
    +override_dh_autoreconf:
    
    23
    +	dh_autoreconf debian/rules -- autoreconf
    
    24
    +
    
    25
    +autoreconf-%:
    
    26
    +	cd $* && autoreconf -vfi
    
    27
    +
    
    28
    +.PHONY: autoreconf
    
    29
    +autoreconf: $(addprefix autoreconf-, $(SUBDIRS))
    
    21 30
     
    
    22 31
     override_dh_auto_configure: $(CONFIG_STAMPS)
    
    23 32
     
    
    ... ... @@ -48,8 +57,8 @@ override_dh_auto_install:
    48 57
     	done
    
    49 58
     	find debian/tmp/usr/lib/*/X11/rstart/commands -type f ! -name '@*' -print0 | xargs -0 chmod +x
    
    50 59
     
    
    51
    -override_dh_install:
    
    52
    -	dh_install --fail-missing
    
    60
    +override_dh_missing:
    
    61
    +	dh_missing --fail-missing
    
    53 62
     
    
    54 63
     .PHONY: get-tarballs
    
    55 64
     get-tarballs: $(addprefix get-tarball-,$(SUBDIRS))
    


  • Reply to: