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

[Git][xorg-team/lib/libxrandr][debian-unstable] 7 commits: rules: Use dh_missing.



Title: GitLab

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

Commits:

6 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
     
    
    ... ... @@ -47,27 +47,3 @@ are involved:
    47 47
       case, it appears directly in the .diff.gz.
    
    48 48
     * Otherwise, the patch is added to debian/patches/ which is managed
    
    49 49
       with quilt as documented in /usr/share/doc/quilt/README.source.
    50
    -
    
    51
    -quilt is actually invoked by the Debian X packaging through a larger
    
    52
    -set of scripts called XSFBS. XSFBS brings some other X specific
    
    53
    -features such as managing dependencies and conflicts due to the video
    
    54
    -and input driver ABIs.
    
    55
    -XSFBS itself is maintained in a separate repository at
    
    56
    -  git://git.debian.org/pkg-xorg/xsfbs.git
    
    57
    -and it is pulled inside the other Debian X repositories when needed.
    
    58
    -
    
    59
    -The XSFBS patching system requires a build dependency on quilt. Also
    
    60
    -a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
    
    61
    -so that the XSFBS patching occurs before the actual build. So the
    
    62
    -very first target of the build (likely the one running autoreconf)
    
    63
    -should depend on $(STAMP_DIR)/patch. It should also not depend on
    
    64
    -anything so that parallel builds are correctly supported (nothing
    
    65
    -should probably run while patching is being done). And finally, the
    
    66
    -clean target should depend on the xsfclean target so that patches
    
    67
    -are unapplied on clean.
    
    68
    -
    
    69
    -When the upstream sources contain some DFSG-nonfree files, they are
    
    70
    -listed in text files in debian/prune/ in the "debian-*" branch of
    
    71
    -the Debian repository. XSFBS' scripts then take care of removing
    
    72
    -these listed files during the build so as to generate a modified
    
    73
    -DFSG-free .orig.tar.gz tarball.

  • debian/changelog
    1
    -libxrandr (2:1.5.2-1) UNRELEASED; urgency=medium
    
    1
    +libxrandr (2:1.5.2-1) unstable; urgency=medium
    
    2 2
     
    
    3 3
       * New upstream release.
    
    4 4
       * Migrate to debhelper-compat, bump to 13.
    
    5
    -  * control: Migrate to x11proto-dev.
    
    6
    -
    
    7
    - -- Timo Aaltonen <tjaalton@debian.org>  Tue, 09 Feb 2021 13:21:35 +0200
    
    5
    +  * control: Migrate to x11proto-dev. (Closes: #859355)
    
    6
    +  * rules: Use dh_missing.
    
    7
    +  * Bump policy to 4.6.0.
    
    8
    +  * Update README.source for salsa.
    
    9
    +  * Add upstream metadata, drop git repo from d/watch.
    
    10
    +  * rules: Clean .la files.
    
    11
    +
    
    12
    + -- Timo Aaltonen <tjaalton@debian.org>  Tue, 28 Sep 2021 14:26:17 +0300
    
    8 13
     
    
    9 14
     libxrandr (2:1.5.1-1) unstable; urgency=medium
    
    10 15
     
    

  • debian/control
    ... ... @@ -11,7 +11,7 @@ Build-Depends:
    11 11
      pkg-config,
    
    12 12
      quilt,
    
    13 13
      xutils-dev (>= 1:7.5+4),
    
    14
    -Standards-Version: 3.9.8
    
    14
    +Standards-Version: 4.6.0
    
    15 15
     Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/libxrandr.git
    
    16 16
     Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/libxrandr.git
    
    17 17
     
    

  • debian/rules
    ... ... @@ -14,7 +14,11 @@ PACKAGE = libxrandr2
    14 14
     	dh $@ --with quilt --builddirectory=build/
    
    15 15
     
    
    16 16
     override_dh_install:
    
    17
    -	dh_install -XlibXrandr.la
    
    17
    +	find $(CURDIR)/debian/tmp -name "*.la" -type f -delete
    
    18
    +	dh_install
    
    19
    +
    
    20
    +override_dh_missing:
    
    21
    +	dh_missing --fail-missing
    
    18 22
     
    
    19 23
     override_dh_strip:
    
    20 24
     	dh_strip --dbgsym-migration="$(PACKAGE)-dbg (<< 2:1.5.1-1~)"
    

  • debian/upstream/metadata
    1
    +---
    
    2
    +Bug-Database: https://gitlab.freedesktop.org/xorg/lib/libxrandr/-/issues
    
    3
    +Bug-Submit: https://gitlab.freedesktop.org/xorg/lib/libxrandr/-/issues
    
    4
    +Repository: https://gitlab.freedesktop.org/xorg/lib/libxrandr.git
    
    5
    +Repository-Browse: https://gitlab.freedesktop.org/xorg/lib/libxrandr

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


  • Reply to: