[Git][xorg-team/lib/libxres][debian-unstable] 4 commits: control: Replace pkg-config with pkgconf

Cyril Brulebois pushed to branch debian-unstable at X Strike Force / lib / libxres


Commits:
7c3fa2e2 by Samuel Thibault at 2026-03-24T10:17:53+01:00
control: Replace pkg-config with pkgconf

- - - - -
454d31f5 by Samuel Thibault at 2026-03-24T21:29:11+01:00
Drop rules for udeb

It's indeed already automatic.

- - - - -
d34bec0a by Samuel Thibault at 2026-03-24T21:29:11+01:00
copyright: Rewrite as DEP-5, complete copyright notices

- - - - -
1e37be47 by Cyril Brulebois at 2026-03-26T18:40:44+01:00
Release 2:1.2.1-2

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -6,9 +6,12 @@ libxres (2:1.2.1-2) unstable; urgency=medium
       libxext-dev and xutils-dev.
 
   [ Samuel Thibault ]
-  * control, rules, libxres1-udeb.install: Add libxres1-udeb package.
+  * control, libxres1-udeb.install: Add libxres1-udeb package
+    (Helps: #1130925).
+  * control: Replace pkg-config with pkgconf.
+  * copyright: Rewrite as DEP-5, complete copyright notices.
 
- -- Cyril Brulebois <[email protected]>  Sun, 22 Mar 2026 18:52:51 +0100
+ -- Cyril Brulebois <[email protected]>  Thu, 26 Mar 2026 18:40:34 +0100
 
 libxres (2:1.2.1-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Build-Depends:
  libx11-dev,
  libxext-dev,
  x11proto-dev,
- pkg-config,
+ pkgconf,
  quilt,
  automake,
  libtool,


=====================================
debian/copyright
=====================================
@@ -1,25 +1,73 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/lib/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: libXres
+Upstream-Contact: [email protected]
+Source: http://xorg.freedesktop.org/releases/individual/lib/
 
-   Copyright (c) 2002  XFree86 Inc
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
+Files: *
+Copyright: 1994-2003, XFree86 Inc
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is fur-
+ nished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+ NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+ NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the XFree86 Project shall not
+ be used in advertising or otherwise to promote the sale, use or other deal-
+ ings in this Software without prior written authorization from the XFree86
+ Project.
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+Files: man/Makefile.am
+Copyright: 2005, Oracle and/or its affiliates.
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
+Files: Makefile.am
+ ./configure.ac
+Copyright: 2003, Keith Packard, Noah Levitt
+License: HPND-sell-variant
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of Keith Packard not be used in
+ advertising or publicity pertaining to distribution of the software without
+ specific, written prior permission.  Keith Packard makes no
+ representations about the suitability of this software for any purpose.  It
+ is provided "as is" without express or implied warranty.
+ .
+ KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.


=====================================
debian/rules
=====================================
@@ -26,6 +26,3 @@ override_dh_clean:
 override_dh_install:
 	find debian/tmp -name '*.la' -delete
 	dh_install
-
-override_dh_makeshlibs:
-	dh_makeshlibs --add-udeb=libxres1-udeb



View it on GitLab: https://salsa.debian.org/xorg-team/lib/libxres/-/compare/6dbc7d96c6cd03dc72af37accb1bc4d19a12f8e3...1e37be47bc3322ff78a99ffdc25d847bfef5e818

-- 
View it on GitLab: https://salsa.debian.org/xorg-team/lib/libxres/-/compare/6dbc7d96c6cd03dc72af37accb1bc4d19a12f8e3...1e37be47bc3322ff78a99ffdc25d847bfef5e818
You're receiving this email because of your account on salsa.debian.org.