[SCM] aribas packaging branch, master, updated. upstream/1.20-37-g2007b9f

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 527572853b5d764303e94c21760a0d1373777913
Author: Ralf Treinen <treinen at debian.org>
Date:   Sat Aug 25 10:10:30 2007 +0200

    Imported Debian patch 1.53-2

diff --git a/debian/changelog b/debian/changelog
index afe5c55..b312e14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+aribas (1.53-2) unstable; urgency=low
+
+  * debian watch file version 3, check for upstream tar ball linked from the
+    download web page.
+  * Use dpatch to manage patches
+  * Patch 01_no-strip: do not strip executable in Makefile (closes: Bug#436470)
+  * Standards-Version 3.7.2 (no change)
+
+ -- Ralf Treinen <treinen at debian.org>  Sat, 25 Aug 2007 10:10:30 +0200
+
 aribas (1.53-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 64f556a..802826c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: aribas
 Section: math
 Priority: optional
 Maintainer: Ralf Treinen <treinen at debian.org>
-Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4)
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 4), dpatch
 
 Package: aribas
 Architecture: any
diff --git a/debian/doc-base.aribas b/debian/doc-base.aribas
index 60d3b36..f6e110d 100644
--- a/debian/doc-base.aribas
+++ b/debian/doc-base.aribas
@@ -5,4 +5,5 @@ Abstract: The Aribas Documentation and Tutorial
 Section: math
 
 Format: text
-Files: /usr/share/doc/aribas/aribas.{doc,tut}
+Files: /usr/share/doc/aribas/aribas.doc.gz /usr/share/doc/aribas/aribas.tut.gz
+
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..03a884e
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+01_no_strip
diff --git a/debian/patches/01_no_strip.dpatch b/debian/patches/01_no_strip.dpatch
new file mode 100644
index 0000000..637682d
--- /dev/null
+++ b/debian/patches/01_no_strip.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_no-strip.dpatch by Ralf Treinen <treinen at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not strip executable in Makefile
+
+ at DPATCH@
+diff -urNad aribas-1.53~/src/LINUX/Makefile.linux aribas-1.53/src/LINUX/Makefile.linux
+--- aribas-1.53~/src/LINUX/Makefile.linux	2004-11-06 16:29:53.000000000 +0100
++++ aribas-1.53/src/LINUX/Makefile.linux	2007-08-25 10:14:19.000000000 +0200
+@@ -48,7 +48,7 @@
+ 
+ $(PROGRAM): $(OBJECTS) $(ASSOBJECTS)
+ 	$(CC) -o $(PROGRAM) $(LFLAGS) $(OBJECTS) $(ASSOBJECTS)
+-	strip $(PROGRAM)
++
+ clean:
+ 	\rm *.o
+ 
+diff -urNad aribas-1.53~/src/Makefile aribas-1.53/src/Makefile
+--- aribas-1.53~/src/Makefile	2007-08-25 10:13:56.000000000 +0200
++++ aribas-1.53/src/Makefile	2007-08-25 10:14:35.000000000 +0200
+@@ -44,7 +44,7 @@
+ 
+ $(PROGRAM): $(OBJECTS)
+ 	$(CC) -o $(PROGRAM) $(OBJECTS)
+-	strip $(PROGRAM)
++
+ clean:
+ 	\rm *.o
+ 
diff --git a/debian/rules b/debian/rules
index b8b1b58..ce5f4f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 
 #export DH_VERBOSE=1
 
+include /usr/share/dpatch/dpatch.make
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	OPTFLAGS=-O0 
 else	
@@ -10,7 +12,7 @@ else
 endif	
 
 build: build-stamp
-build-stamp:
+build-stamp: patch
 	if [ $(DEB_BUILD_ARCH) == i386 ];\
 	then \
 		cp src/LINUX/arito386.S src;\
@@ -26,7 +28,7 @@ build-stamp:
 			ASSOBJECTS="$$ASSOBJECTS"
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -63,4 +65,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch
diff --git a/debian/watch b/debian/watch
index c794b7a..9f54897 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,5 @@
-version=2
-ftp://ftp.mathematik.uni-muenchen.de/pub/forster/aribas/aribas-([\d.]*)\.tar\.gz
+version=3
+
+http://www.mathematik.uni-muenchen.de/~forster/sw/adownload.html \
+   ftp://ftp.mathematik.uni-muenchen.de/pub/forster/aribas/aribas-([\d\.]*)\.tar\.gz
 

-- 
aribas packaging