Here's the diff for the NMU I'll be uploading. debdiff shunit2_2.1.2-1.dsc shunit2_2.1.2-1.1.dsc shunit2-2.1.2/debian/control | 2 +- shunit2-2.1.2/debian/rules | 8 ++++---- shunit2-2.1.2/debian/changelog | 8 ++++++++ Makefile | 16 ++++++++-------- 4 files changed, 21 insertions(+), 13 deletions(-)
diff -u shunit2-2.1.2/debian/control shunit2-2.1.2/debian/control
--- shunit2-2.1.2/debian/control
+++ shunit2-2.1.2/debian/control
@@ -6,7 +6,7 @@
Standards-Version: 3.7.3
Package: shunit2
-Architecture: any
+Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: A unit test framework for Bourne based shell scripts
shUnit2 was originally developed to provide a consistent testing
diff -u shunit2-2.1.2/debian/rules shunit2-2.1.2/debian/rules
--- shunit2-2.1.2/debian/rules
+++ shunit2-2.1.2/debian/rules
@@ -53,12 +53,12 @@
install -m 644 build/shunit2 $(CURDIR)/debian/shunit2/usr/share/shunit2
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
# Build architecture-dependent files here.
binary-arch: build install
+# We have nothing to do by default.
+
+# Build architecture-independent files here.
+binary-indep: build install
dh_testdir
dh_testroot
dh_installchangelogs
diff -u shunit2-2.1.2/debian/changelog shunit2-2.1.2/debian/changelog
--- shunit2-2.1.2/debian/changelog
+++ shunit2-2.1.2/debian/changelog
@@ -1,3 +1,11 @@
+shunit2 (2.1.2-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Use CURDIR instead of PWD in top level Makefile. (Closes: #472111)
+ * Set Architecture: all. (Closes: #473749)
+
+ -- Christoph Berg <[EMAIL PROTECTED]> Tue, 01 Apr 2008 14:20:07 +0200
+
shunit2 (2.1.2-1) unstable; urgency=low
* Initial release (Closes: #456140)
only in patch2:
unchanged:
--- shunit2-2.1.2.orig/Makefile
+++ shunit2-2.1.2/Makefile
@@ -2,14 +2,14 @@
PROG=shunit2
-BIN_DIR=$(PWD)/bin
-BUILD_DIR=$(PWD)/build
-DIST_DIR=$(PWD)/dist
-LIB_DIR=$(PWD)/lib
-SHARE_DIR=$(PWD)/share
-SRC_DIR=$(PWD)/src
-TEST_DIR=$(PWD)/test
-TMP_DIR=$(PWD)/tmp
+BIN_DIR=$(CURDIR)/bin
+BUILD_DIR=$(CURDIR)/build
+DIST_DIR=$(CURDIR)/dist
+LIB_DIR=$(CURDIR)/lib
+SHARE_DIR=$(CURDIR)/share
+SRC_DIR=$(CURDIR)/src
+TEST_DIR=$(CURDIR)/test
+TMP_DIR=$(CURDIR)/tmp
DOCBOOK_BUILD_DIR=$(BUILD_DIR)/docbook
DOCBOOK_SHARE_DIR=$(SHARE_DIR)/docbook
Christoph
--
[EMAIL PROTECTED] | http://www.df7cb.de/
signature.asc
Description: Digital signature
