The following commit has been merged in the master branch:
commit ec2f5fd1baa53274fa16edccfdae9722cd3be29e
Author: Jakub Wilk <[email protected]>
Date: Thu Feb 2 22:24:10 2012 +0100
Fixed TRIPLETT -> TRIPLET typo in various test files
Acked-by: Niels Thykier <[email protected]>
diff --git a/t/tests/binaries-multiarch-wrong-dir/debian/Makefile
b/t/tests/binaries-multiarch-wrong-dir/debian/Makefile
index 69df51a..77c552c 100644
--- a/t/tests/binaries-multiarch-wrong-dir/debian/Makefile
+++ b/t/tests/binaries-multiarch-wrong-dir/debian/Makefile
@@ -6,9 +6,9 @@
ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq (i386,$(ARCH))
- WRONG_TRIPLETT = x86_64-linux-gnu
+ WRONG_TRIPLET = x86_64-linux-gnu
else
- WRONG_TRIPLETT = i386-linux-gnu
+ WRONG_TRIPLET = i386-linux-gnu
endif
@@ -17,8 +17,8 @@ all:
install:
# Install it once under the wrong dir
- install -d $(DESTDIR)/usr/lib/$(WRONG_TRIPLETT)
- install -m 644 -c -s libbasic.so.2
$(DESTDIR)/usr/lib/$(WRONG_TRIPLETT)/libbasic.so.2
+ install -d $(DESTDIR)/usr/lib/$(WRONG_TRIPLET)
+ install -m 644 -c -s libbasic.so.2
$(DESTDIR)/usr/lib/$(WRONG_TRIPLET)/libbasic.so.2
clean distclean:
rm -f libbasic.so.2
diff --git a/t/tests/binaries-multiarch/debian/Makefile
b/t/tests/binaries-multiarch/debian/Makefile
index a34620f..9826b20 100644
--- a/t/tests/binaries-multiarch/debian/Makefile
+++ b/t/tests/binaries-multiarch/debian/Makefile
@@ -6,9 +6,9 @@
ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq (i386,$(ARCH))
- TRIPLETT = i386-linux-gnu
+ TRIPLET = i386-linux-gnu
else
- TRIPLETT = x86_64-linux-gnu
+ TRIPLET = x86_64-linux-gnu
endif
@@ -17,8 +17,8 @@ all:
install:
# install it under the correct triplet directory
- install -d $(DESTDIR)/usr/lib/$(TRIPLETT)
- install -m 644 -c -s libbasic.so.2
$(DESTDIR)/usr/lib/$(TRIPLETT)/libbasic.so.2
+ install -d $(DESTDIR)/usr/lib/$(TRIPLET)
+ install -m 644 -c -s libbasic.so.2
$(DESTDIR)/usr/lib/$(TRIPLET)/libbasic.so.2
clean distclean:
rm -f libbasic.so.2
diff --git a/t/tests/binaries-multiarch/debian/debian/rules
b/t/tests/binaries-multiarch/debian/debian/rules
index 810606c..ffff87a 100644
--- a/t/tests/binaries-multiarch/debian/debian/rules
+++ b/t/tests/binaries-multiarch/debian/debian/rules
@@ -7,9 +7,9 @@
ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq (i386,$(ARCH))
- TRIPLETT = i386-linux-gnu
+ TRIPLET = i386-linux-gnu
else
- TRIPLETT = x86_64-linux-gnu
+ TRIPLET = x86_64-linux-gnu
endif
%:
@@ -18,4 +18,4 @@ endif
override_dh_makeshlibs:
# dpkg-dev uses ld.so.conf so if we do not pass the lib directly
# this will fail on all x86 machines without with libc6 < 2.13-5
- dh_makeshlibs -- -edebian/libbasic2/usr/lib/$(TRIPLETT)/libbasic.so.2
+ dh_makeshlibs -- -edebian/libbasic2/usr/lib/$(TRIPLET)/libbasic.so.2
diff --git a/t/tests/files-multiarch-missing-pre-deps/debian/Makefile
b/t/tests/files-multiarch-missing-pre-deps/debian/Makefile
index a34620f..9826b20 100644
--- a/t/tests/files-multiarch-missing-pre-deps/debian/Makefile
+++ b/t/tests/files-multiarch-missing-pre-deps/debian/Makefile
@@ -6,9 +6,9 @@
ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq (i386,$(ARCH))
- TRIPLETT = i386-linux-gnu
+ TRIPLET = i386-linux-gnu
else
- TRIPLETT = x86_64-linux-gnu
+ TRIPLET = x86_64-linux-gnu
endif
@@ -17,8 +17,8 @@ all:
install:
# install it under the correct triplet directory
- install -d $(DESTDIR)/usr/lib/$(TRIPLETT)
- install -m 644 -c -s libbasic.so.2
$(DESTDIR)/usr/lib/$(TRIPLETT)/libbasic.so.2
+ install -d $(DESTDIR)/usr/lib/$(TRIPLET)
+ install -m 644 -c -s libbasic.so.2
$(DESTDIR)/usr/lib/$(TRIPLET)/libbasic.so.2
clean distclean:
rm -f libbasic.so.2
diff --git a/t/tests/files-multiarch-missing-pre-deps/debian/debian/rules
b/t/tests/files-multiarch-missing-pre-deps/debian/debian/rules
index 810606c..ffff87a 100644
--- a/t/tests/files-multiarch-missing-pre-deps/debian/debian/rules
+++ b/t/tests/files-multiarch-missing-pre-deps/debian/debian/rules
@@ -7,9 +7,9 @@
ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq (i386,$(ARCH))
- TRIPLETT = i386-linux-gnu
+ TRIPLET = i386-linux-gnu
else
- TRIPLETT = x86_64-linux-gnu
+ TRIPLET = x86_64-linux-gnu
endif
%:
@@ -18,4 +18,4 @@ endif
override_dh_makeshlibs:
# dpkg-dev uses ld.so.conf so if we do not pass the lib directly
# this will fail on all x86 machines without with libc6 < 2.13-5
- dh_makeshlibs -- -edebian/libbasic2/usr/lib/$(TRIPLETT)/libbasic.so.2
+ dh_makeshlibs -- -edebian/libbasic2/usr/lib/$(TRIPLET)/libbasic.so.2
diff --git a/t/tests/files-multiarch-so-script/debian/Makefile
b/t/tests/files-multiarch-so-script/debian/Makefile
index 2dd5571..516fc33 100644
--- a/t/tests/files-multiarch-so-script/debian/Makefile
+++ b/t/tests/files-multiarch-so-script/debian/Makefile
@@ -6,9 +6,9 @@
ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq (i386,$(ARCH))
- TRIPLETT = i386-linux-gnu
+ TRIPLET = i386-linux-gnu
else
- TRIPLETT = x86_64-linux-gnu
+ TRIPLET = x86_64-linux-gnu
endif
@@ -17,8 +17,8 @@ all:
install:
# install it under the correct triplet directory
- install -d $(DESTDIR)/usr/lib/$(TRIPLETT)
- install -m 644 -c libbasic.so.2
$(DESTDIR)/usr/lib/$(TRIPLETT)/libbasic.so.2
+ install -d $(DESTDIR)/usr/lib/$(TRIPLET)
+ install -m 644 -c libbasic.so.2
$(DESTDIR)/usr/lib/$(TRIPLET)/libbasic.so.2
clean distclean:
rm -f libbasic.so.2
diff --git a/t/tests/files-multiarch-so-script/debian/debian/rules
b/t/tests/files-multiarch-so-script/debian/debian/rules
index 810606c..ffff87a 100644
--- a/t/tests/files-multiarch-so-script/debian/debian/rules
+++ b/t/tests/files-multiarch-so-script/debian/debian/rules
@@ -7,9 +7,9 @@
ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq (i386,$(ARCH))
- TRIPLETT = i386-linux-gnu
+ TRIPLET = i386-linux-gnu
else
- TRIPLETT = x86_64-linux-gnu
+ TRIPLET = x86_64-linux-gnu
endif
%:
@@ -18,4 +18,4 @@ endif
override_dh_makeshlibs:
# dpkg-dev uses ld.so.conf so if we do not pass the lib directly
# this will fail on all x86 machines without with libc6 < 2.13-5
- dh_makeshlibs -- -edebian/libbasic2/usr/lib/$(TRIPLETT)/libbasic.so.2
+ dh_makeshlibs -- -edebian/libbasic2/usr/lib/$(TRIPLET)/libbasic.so.2
--
Debian package checker
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
