Package: html2text Version: 1.3.2a-15 Tags: patch
diff -u html2text-1.3.2a/debian/changelog html2text-1.3.2a/debian/changelog --- html2text-1.3.2a/debian/changelog +++ html2text-1.3.2a/debian/changelog @@ -1,3 +1,15 @@ +html2text (1.3.2a-15ubuntu3) raring; urgency=low + + * Honor `nocheck' in DEB_BUILD_OPTIONS. + + -- Matthias Klose <d...@ubuntu.com> Wed, 06 Mar 2013 17:28:55 +0800 + +html2text (1.3.2a-15ubuntu2) raring; urgency=low + + * Use <triplet>-g++ to build the package. + + -- Matthias Klose <d...@ubuntu.com> Wed, 06 Mar 2013 16:21:54 +0800 + html2text (1.3.2a-15ubuntu1) raring; urgency=low * Converts ä to U+00E4 instead U+00E5 (LP: #586279). diff -u html2text-1.3.2a/debian/rules html2text-1.3.2a/debian/rules --- html2text-1.3.2a/debian/rules +++ html2text-1.3.2a/debian/rules @@ -7,14 +7,17 @@ include /usr/share/quilt/quilt.make +DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +CC = $(DEB_HOST_GNU_TYPE)-g++ + DEB=debian/html2text build: build-stamp build-stamp: debian/stamp-patched dh_testdir - ./configure --prefix=$(DEB)/usr + CC="$(CC)" ./configure --prefix=$(DEB)/usr sed -i 's/$$(CXXFLAGS)/$$(CXXFLAGS) $$(DEB_CXXFLAGS)/g' Makefile - $(MAKE) DEB_CXXFLAGS="$(CFLAGS)" LOCAL_LDFLAGS=-g + $(MAKE) DEB_CXXFLAGS="$(CFLAGS)" LOCAL_LDFLAGS=-g touch build-stamp clean: unpatch @@ -32,7 +35,9 @@ dh_installdirs test: build +ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) cd debian/tests/ && sh runtests +endif binary-indep: diff -u html2text-1.3.2a/debian/patches/series html2text-1.3.2a/debian/patches/series --- html2text-1.3.2a/debian/patches/series +++ html2text-1.3.2a/debian/patches/series @@ -10,0 +11 @@ +811-triplet-cc.patch only in patch2: unchanged: --- html2text-1.3.2a.orig/debian/patches/811-triplet-cc.patch +++ html2text-1.3.2a/debian/patches/811-triplet-cc.patch @@ -0,0 +1,13 @@ +Index: b/configure +=================================================================== +--- a/configure 2004-01-12 15:47:18.000000000 +0000 ++++ b/configure 2013-03-06 08:20:56.944803098 +0000 +@@ -39,7 +39,7 @@ + } + EOF + CXX=unknown; +-for i in "CC" "g++" "cc" "$CC"; do ++for i in "$CC" "CC" "g++" "cc"; do + if $i -c $tmp_file.C 2>/dev/null; then + CXX="$i"; + break;
