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

libxshmfence: Changes to 'debian-unstable'



 debian/changelog |    6 ++++++
 debian/rules     |   11 ++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit d1f62c7f8a335810386c4fad286572d370602e97
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Oct 5 15:17:15 2014 +0200

    Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e3c94a8..fe2139b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-libxshmfence (1.1-4) UNRELEASED; urgency=medium
+libxshmfence (1.1-4) unstable; urgency=medium
 
   * Revert to /tmp as shared memory dir on kfreebsd (closes: #754699).
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 05 Oct 2014 15:15:43 +0200
+ -- Julien Cristau <jcristau@debian.org>  Sun, 05 Oct 2014 15:16:50 +0200
 
 libxshmfence (1.1-3) unstable; urgency=medium
 

commit dfdc89eb0a7794c450d8ab0d2cec3883cd7f0825
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Oct 5 15:16:28 2014 +0200

    Revert to /tmp as shared memory dir on kfreebsd (closes: #754699).

diff --git a/debian/changelog b/debian/changelog
index 548e310..e3c94a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxshmfence (1.1-4) UNRELEASED; urgency=medium
+
+  * Revert to /tmp as shared memory dir on kfreebsd (closes: #754699).
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 05 Oct 2014 15:15:43 +0200
+
 libxshmfence (1.1-3) unstable; urgency=medium
 
   * Exclude hurd from arch list.  They don't support PTHREAD_PROCESS_SHARED.
diff --git a/debian/rules b/debian/rules
index f84873f..f466c1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,14 @@
 #!/usr/bin/make -f
 
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+SHMDIR = /dev/shm
+else
+# kfreebsd buildds don't seem to have writable /dev/shm
+SHMDIR = /tmp
+endif
+
 %:
 	dh $@ --with quilt,autoreconf --builddirectory=build/ --parallel
 
@@ -12,7 +21,7 @@ override_dh_install:
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	    --disable-silent-rules \
-	    --with-shared-memory-dir=/dev/shm
+	    --with-shared-memory-dir=$(SHMDIR)
 
 override_dh_auto_test:
 	dh_auto_test -- VERBOSE=1


Reply to: