[SCM] lbt packaging branch, master, updated. upstream/1.2.1-7-ga8d9895

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 45ff80c3f10b68cb749284bab6d2527897648a60
Author: Ralf Treinen <treinen at debian.org>
Date:   Wed Jul 6 21:25:20 2005 +0200

    Imported Debian patch 1.2.2-2

diff --git a/debian/changelog b/debian/changelog
index e87f648..119dfbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lbt (1.2.2-2) unstable; urgency=low
+
+  * Standards-version 3.6.2 (no change).
+  * Debhelper compatibility 4, put into file debian/compat.
+  * Recommends graphiz (instead of Suggests)
+  * Rebuild with gcc 4.
+
+ -- Ralf Treinen <treinen at debian.org>  Wed,  6 Jul 2005 21:25:20 +0200
+
 lbt (1.2.2-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
index d9e0545..1b595da 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: lbt
 Section: math
 Priority: optional
 Maintainer: Ralf Treinen <treinen at debian.org>
-Build-Depends: debhelper (>> 3.0.0)
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>= 4.0)
+Standards-Version: 3.6.2
 
 Package: lbt
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: graphviz
+Recommends: graphviz
 Description: converts from LTL formulas to Büchi automata
  This software converts a linear temporal logic (ltl) formula to a
  generalised Büchi automaton. The resulting automaton may be used, for
diff --git a/debian/rules b/debian/rules
index 4774a91..e2ac1a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,14 @@
 # debian/rules for lbt
 
 #export DH_VERBOSE=1
-export DH_COMPAT=3
 
+# workaround for gcc-4.0 bug on m68k
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifeq ($(DEB_HOST_GNU_TYPE),"m68k-linux-gnu")
+	OPTFLAGS = "-O2"
+else
+	OPTFLAGS = "-O3"
+endif
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -16,7 +22,7 @@ build: build-stamp
 
 build-stamp:
 	dh_testdir
-	$(MAKE)
+	$(MAKE) CFLAGS=${OPTFLAGS}
 	touch build-stamp
 
 clean:

-- 
lbt packaging