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

[Git][xorg-team/driver/xserver-xorg-video-fbdev][debian-unstable] 6 commits: control: Migrate to x11proto-dev.



Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / driver / xserver-xorg-video-fbdev

Commits:

5 changed files:

Changes:

  • debian/README.source
    ... ... @@ -19,13 +19,13 @@ 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
     
    
    28
    -The .orig.tar.gz upstream source file could be generated using this
    
    28
    +The .orig.tar.gz upstream source file could be generated this
    
    29 29
     "upstream-*" branch in the Debian git repository but it is actually
    
    30 30
     copied from upstream tarballs directly.
    
    31 31
     
    

  • debian/changelog
    1
    +xserver-xorg-video-fbdev (1:0.5.0-2) UNRELEASED; urgency=medium
    
    2
    +
    
    3
    +  * control: Migrate to x11proto-dev.
    
    4
    +  * Migrate to debhelper-compat, bump to 13.
    
    5
    +  * Remove Cyril from Uploaders.
    
    6
    +  * Bump policy to 4.6.0.
    
    7
    +  * control: Update Vcs urls.
    
    8
    +  * Update README.source for salsa.
    
    9
    +
    
    10
    + -- Timo Aaltonen <tjaalton@debian.org>  Wed, 25 Aug 2021 14:57:27 +0300
    
    11
    +
    
    1 12
     xserver-xorg-video-fbdev (1:0.5.0-1) unstable; urgency=medium
    
    2 13
     
    
    3 14
       * Let uscan verify upstream tarball signatures.
    

  • debian/compat deleted
    1
    -8

  • debian/control
    ... ... @@ -2,22 +2,16 @@ Source: xserver-xorg-video-fbdev
    2 2
     Section: x11
    
    3 3
     Priority: optional
    
    4 4
     Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
    
    5
    -Uploaders: Cyril Brulebois <kibi@debian.org>
    
    6 5
     Build-Depends:
    
    7
    - debhelper (>= 8),
    
    8
    - dh-autoreconf,
    
    6
    + debhelper-compat (= 13),
    
    9 7
      quilt,
    
    10 8
      pkg-config,
    
    11 9
      xserver-xorg-dev (>= 2:1.11.99.901),
    
    12
    - x11proto-core-dev,
    
    13
    - x11proto-fonts-dev,
    
    14
    - x11proto-randr-dev,
    
    15
    - x11proto-render-dev,
    
    16
    - x11proto-video-dev,
    
    10
    + x11proto-dev,
    
    17 11
      xutils-dev (>= 1:7.5+1),
    
    18
    -Standards-Version: 3.9.3
    
    19
    -Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-fbdev
    
    20
    -Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-fbdev.git
    
    12
    +Standards-Version: 4.6.0
    
    13
    +Vcs-Git: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-fbdev.git
    
    14
    +Vcs-Browser: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-fbdev
    
    21 15
     
    
    22 16
     Package: xserver-xorg-video-fbdev
    
    23 17
     Architecture: any
    

  • debian/rules
    ... ... @@ -11,8 +11,12 @@ override_dh_auto_clean:
    11 11
     
    
    12 12
     # Configuration, with or without xv:
    
    13 13
     override_dh_auto_configure:
    
    14
    -	dh_auto_configure $(OOT)-main/ -- --enable-xv
    
    15
    -	dh_auto_configure $(OOT)-udeb/ -- --disable-xv
    
    14
    +	dh_auto_configure $(OOT)-main/ -- \
    
    15
    +		--libdir=/usr/lib \
    
    16
    +		--enable-xv
    
    17
    +	dh_auto_configure $(OOT)-udeb/ -- \
    
    18
    +		--libdir=/usr/lib \
    
    19
    +		--disable-xv
    
    16 20
     
    
    17 21
     # Build:
    
    18 22
     override_dh_auto_build:
    
    ... ... @@ -27,12 +31,16 @@ override_dh_auto_install:
    27 31
     # Kill *.la files, and forget no-one:
    
    28 32
     override_dh_install:
    
    29 33
     	find debian/tmp-* -name '*.la' -delete
    
    30
    -	dh_install -p$(PACKAGE)      --sourcedir=debian/tmp-main --fail-missing
    
    31
    -	dh_install -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb --fail-missing
    
    34
    +	dh_install -p$(PACKAGE)      --sourcedir=debian/tmp-main
    
    35
    +	dh_install -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb
    
    36
    +
    
    37
    +override_dh_missing:
    
    38
    +	dh_missing -p$(PACKAGE)      --sourcedir=debian/tmp-main --fail-missing
    
    39
    +	dh_missing -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb --fail-missing
    
    32 40
     
    
    33 41
     # That's a plugin, use appropriate warning level:
    
    34 42
     override_dh_shlibdeps:
    
    35 43
     	dh_shlibdeps -- --warnings=6
    
    36 44
     
    
    37 45
     %:
    
    38
    -	dh $@ --with quilt,autoreconf,xsf
    46
    +	dh $@ --with quilt,xsf


  • Reply to: