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

Sun May 15 11:51:41 UTC 2011

The following commit has been merged in the master branch:
commit 5498d8dbdf170bd9efe99c7aa243d17c561a114d
Author: Ralf Treinen <treinen at debian.org>
Date:   Sat Nov 21 14:46:14 2009 +0100

    Imported Debian patch 1.63-4

diff --git a/debian/changelog b/debian/changelog
index 50d21af..49381d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+aribas (1.63-4) unstable; urgency=low
+
+  * Convert to source format 3.0 (quilt) :
+    - no longer build-depends on dpatch
+    - no patching in debian/rules
+    - debian/patches converted to quilt style
+    - added debian/source/format
+  * debian/watch: use passive ftp mode (closes: Bug#552545).
+  * Debhelper compatibility level 7.
+    - call dh_prep instead of dh_clean -k
+  * Standards-version 3.8.3 (no change)
+  * debian/copyright:
+    - add that users are free to choose a version of GPL later than 2
+    - point to versionend GPL-2 file.
+
+ -- Ralf Treinen <treinen at debian.org>  Sat, 21 Nov 2009 14:46:14 +0100
+
 aribas (1.63-3) unstable; urgency=low
 
   * Add dependency on emacsen-common (closes: Bug#503323).
diff --git a/debian/compat b/debian/compat
index 733787e..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1,2 +1 @@
-4
-
+7
diff --git a/debian/control b/debian/control
index 4eb2b89..36ef87c 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.8.0
-Build-Depends: debhelper (>= 4), dpatch
+Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7)
 Homepage: http://www.mathematik.uni-muenchen.de/~forster/sw/aribas.html
 
 Package: aribas
diff --git a/debian/copyright b/debian/copyright
index bd9716d..50904db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,9 @@ Copyright (C) 1996-2008 Otto Forster
 
 Licence:
 
-You are free to distribute this software under the terms of
-the GNU General Public License, version 2.
-On Debian systems, the complete text of the GNU General Public
-License can be found in the /usr/share/common-licenses/GPL file.
+You are free to distribute this software under the terms of the GNU
+General Public License, either version 2 of the License, or (at the
+users option) any later version.       
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in the /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/doc-base.aribas b/debian/doc-base.aribas
index fd06c2f..6140c00 100644
--- a/debian/doc-base.aribas
+++ b/debian/doc-base.aribas
@@ -6,4 +6,3 @@ Section: Science/Mathematics
 
 Format: text
 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
deleted file mode 100644
index 03a884e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_no_strip
diff --git a/debian/patches/01_no_strip.dpatch b/debian/patches/no_strip
old mode 100644
new mode 100755
similarity index 66%
rename from debian/patches/01_no_strip.dpatch
rename to debian/patches/no_strip
index 637682d..f111698
--- a/debian/patches/01_no_strip.dpatch
+++ b/debian/patches/no_strip
@@ -1,11 +1,6 @@
-#! /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
+Author: Ralf Treinen <treinen at debian.org>
+Description: 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 @@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..beb7d11
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no_strip
diff --git a/debian/rules b/debian/rules
index 5556fca..38e2cfe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,15 @@
 
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	OPTFLAGS=-O0 
 else	
 	OPTFLAGS=-O
 endif	
 
-build: build-stamp
-build-stamp: patch
+build: build-stamp 
+
+build-stamp:
 	if [ "$(DEB_BUILD_ARCH)" = "i386" ];\
 	then \
 		cp src/LINUX/arito386.S src;\
@@ -28,7 +27,7 @@ build-stamp: patch
 			ASSOBJECTS="$$ASSOBJECTS"
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -38,7 +37,7 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	install -m 755 src/aribas debian/aribas/usr/bin
 	cp src/EL/aribas.el debian/aribas/usr/share/emacs/site-lisp/aribas
@@ -65,4 +64,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
index 28daf6b..3b53c69 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-ftp://ftp.mathematik.uni-muenchen.de/pub/forster/aribas/UNIX_LINUX/aribas-([.\d*]).tar.gz
\ No newline at end of file
+
+opts=pasv ftp://ftp.mathematik.uni-muenchen.de/pub/forster/aribas/UNIX_LINUX/aribas-([\.\d]*)\.tar\.gz

-- 
aribas packaging

