[SCM] maria packaging branch, master, updated. upstream/1.2-22-gc4c33c2

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 6f8490a47247bf6a61c9f46215ca2f21d212710b
Author: Ralf Treinen <treinen at debian.org>
Date:   Fri Aug 5 12:38:59 2005 +0200

    Imported Debian patch 1.3.4-7

diff --git a/debian/changelog b/debian/changelog
index 5042437..6e8c29c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maria (1.3.4-7) unstable; urgency=low
+
+  * Compile with "-O3" instead of "-O2" on m68k to work around a FTBFS
+    caused by a gcc-4.0 bug.
+  * texi2html now produces *html files in subdirectory "maria/"
+
+ -- Ralf Treinen <treinen at debian.org>  Fri,  5 Aug 2005 12:38:59 +0200
+
 maria (1.3.4-6) unstable; urgency=low
 
   * Standards Version 3.6.2 (no changes).
diff --git a/debian/maria-doc.install b/debian/maria-doc.install
index 22e8fb8..bb3f4be 100644
--- a/debian/maria-doc.install
+++ b/debian/maria-doc.install
@@ -1 +1 @@
-doc/*.html	usr/share/doc/maria-doc/html
+doc/maria/*.html	usr/share/doc/maria-doc/html
diff --git a/debian/rules b/debian/rules
index e4b894a..20723b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,17 +6,22 @@ export MAKE=make -f Makefile.Linux
 
 include /usr/share/dpatch/dpatch.make
 
+# workaround for gcc-4.0 bug on m68k
+export DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifeq ($(DEB_HOST_ARCH),m68k)
+  OPTFLAGS = -O2
+else			
+  OPTFLAGS = -O3
+endif
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	R_COPTFLAGS = -O0
-else
-	R_COPTFLAGS = -O3
+  OPTFLAGS = -O0
 endif
 
 build: build-stamp
 
 build-stamp: patch
 	dh_testdir
-	$(MAKE) CXXOPTFLAGS=$(R_COPTFLAGS)
+	$(MAKE) CXXOPTFLAGS=$(OPTFLAGS)
 	touch build-stamp
 
 build-doc: build-doc-stamp
@@ -33,7 +38,7 @@ clean: unpatch
 	dh_testroot
 	-rm build-stamp build-doc-stamp
 	-$(MAKE) reallyclean
-	cd doc && rm -f maria.info maria.info-* maria*.html
+	cd doc && rm -f maria.info maria.info-* maria/maria*.html
 	dh_clean
 
 install-indep: build-doc

-- 
maria packaging