Merge lp:~peter-pearse/ubuntu/natty/libidn/prop001 into lp:ubuntu/natty/libidn

[Peter Pearse]

[Steve Langasek (vorlon)]

+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+ export DH_OPTIONS += --ignore=debian/libidn11-dev.docs
+endif

This means we would get a package with different content for a native vs. a cross build; we don't want that.

The only file mentioned in libidn11-dev.docs is doc/libidn.pdf, which is in the source tree - so this shouldn't be a cross-building issue at all. Why do you want to ignore this file? Or what causes it to go missing during build?

review: Needs Fixing

Unmerged revisions

22. By Peter Pearse on 2011-03-01

Ignore missing file, for cross builds skip check.

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-13 12:56:35 +0000
+++ debian/changelog	2011-03-01 13:38:43 +0000
@@ -1,3 +1,10 @@
+libidn (1.18-1build1ubuntu1) natty; urgency=low
+
+  * Ignore missing file.
+  * For cross builds skip check.
+
+ -- Peter Pearse <[e-mail]>  Tue, 01 Mar 2011 13:33:37 +0000
+
 libidn (1.18-1build1) natty; urgency=low
 
   * No-change upload to reduce changelogs.

=== modified file 'debian/rules'
--- debian/rules	2010-01-22 08:28:34 +0000
+++ debian/rules	2011-03-01 13:38:43 +0000
@@ -9,7 +9,7 @@
 ifeq (,$(filter $(DEB_HOST_ARCH),$(NO_JAVA_ARCHES)))
   ENABLE_JAVA := --enable-java
 else
-  export DH_OPTIONS=-Nlibidn11-java
+  export DH_OPTIONS += -Nlibidn11-java
 endif
 
 # These are used for cross-compiling and for saving the configure script
@@ -34,8 +34,11 @@
 
 	# Add here commands to compile the package.
 	$(MAKE)
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 	$(MAKE) check
-
+else
+	@echo "Skip check during cross builds"
+endif
 	touch $@
 
 clean:
@@ -65,6 +68,9 @@
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+        export DH_OPTIONS += --ignore=debian/libidn11-dev.docs
+endif
 binary-arch: build install
 	dh_testdir
 	dh_testroot