Andreas Boll pushed to branch debian-unstable at X Strike Force / lib / 
libpthread-stubs


Commits:
928ec881 by Julien Cristau at 2013-09-22T14:51:53Z
Stop building libpthread-stubs0 completely

Even hurd doesn't need this anymore.

- - - - -
a35f3979 by Julien Cristau at 2013-09-22T14:58:20Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- − debian/libpthread-stubs0-udeb.install
- − debian/libpthread-stubs0.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,8 @@
-libpthread-stubs (0.3-4) UNRELEASED; urgency=low
+libpthread-stubs (0.3-4) unstable; urgency=low
 
-  * Stop building libpthread-stubs0{,-udeb} on non-hurd-i386.
+  * Stop building libpthread-stubs0{,-udeb} (closes: 706865).
 
- -- Julien Cristau <jcris...@debian.org>  Fri, 11 Nov 2011 23:31:45 +0100
+ -- Julien Cristau <jcris...@debian.org>  Sun, 22 Sep 2013 16:58:17 +0200
 
 libpthread-stubs (0.3-3) unstable; urgency=low
 


=====================================
debian/control
=====================================
@@ -8,35 +8,11 @@ Standards-Version: 3.8.3
 Vcs-Git: git://anonscm.debian.org/git/collab-maint/libpthread-stubs
 Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=collab-maint/libpthread-stubs.git
 
-Package: libpthread-stubs0
-Section: libs
-Architecture: hurd-i386
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: pthread stubs not provided by native libc
- This library provides weak aliases for pthread functions not provided
- in libc or otherwise available by default.  Libraries like libxcb rely
- on pthread stubs to use pthreads optionally, becoming thread-safe when
- linked to libpthread, while avoiding any performance hit when running
- single-threaded. libpthread-stubs supports this behavior even on
- platforms which do not supply all the necessary pthread stubs.  On
- platforms which already supply all the necessary pthread stubs, this
- package has no content.
-
-Package: libpthread-stubs0-udeb
-Section: debian-installer
-Architecture: hurd-i386
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Package-Type: udeb
-Description: pthread stubs not provided by native libc - udeb
- This is a udeb, or a microdeb, for the debian-installer.
-
 Package: libpthread-stubs0-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libpthread-stubs0 (= ${binary:Version}) [hurd-i386]
+Depends: ${misc:Depends}
 Description: pthread stubs not provided by native libc, development files
  This library provides weak aliases for pthread functions not provided
  in libc or otherwise available by default.  Libraries like libxcb rely


=====================================
debian/libpthread-stubs0-udeb.install deleted
=====================================
@@ -1 +0,0 @@
-lib/i386-gnu lib


=====================================
debian/libpthread-stubs0.install deleted
=====================================
@@ -1 +0,0 @@
-lib


=====================================
debian/rules
=====================================
@@ -7,29 +7,11 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture 
-qDEB_HOST_MULTIARCH)
        dh $@ --with autoreconf --builddirectory=build
 
 override_dh_auto_configure: debian/copyright
-ifeq ($(DEB_HOST_ARCH_OS), hurd)
-       # libc.so pulls in libpthread-stubs.so, defeating our configure checks
-       # by making them think the stubs are already in libc.  Point ld at an
-       # empty libpthread-stubs instead.
-       echo 'OUTPUT_FORMAT(elf32-i386)' > debian/libpthread-stubs.so
-       LDFLAGS='-L$(CURDIR)/debian' dh_auto_configure --builddirectory=build
-else
        dh_auto_configure --builddirectory=build
-endif
-
-override_dh_makeshlibs:
-ifeq ($(DEB_HOST_ARCH_OS), hurd)
-       dh_makeshlibs -plibpthread-stubs0 --add-udeb=libpthread-stubs0-udeb
-endif
 
 override_dh_auto_install:
-       dh_auto_install --builddirectory=build
+       dh_auto_install --builddirectory=build --destdir=debian/tmp
        find debian/tmp -name '*.la' -delete
-ifeq ($(DEB_HOST_ARCH_OS), hurd)
-       install -d debian/tmp/lib/$(DEB_HOST_MULTIARCH)
-       mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0* 
debian/tmp/lib/$(DEB_HOST_MULTIARCH)
-       ln -sf /lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so.0 
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpthread-stubs.so
-endif
 
 debian/copyright: debian/copyright.debian COPYING
        cat $+ > $@



View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/libpthread-stubs/compare/2b7b683f1e69338dfdf6391243b5fa34e80adefd...a35f39799f6548c25b3a09987e2091da0a445936

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/libpthread-stubs/compare/2b7b683f1e69338dfdf6391243b5fa34e80adefd...a35f39799f6548c25b3a09987e2091da0a445936
You're receiving this email because of your account on salsa.debian.org.

Reply via email to