[SCM] CERNLIB is a suite of data analysis tools and libraries created for use in physics experiments, but also with applications to other fields such as the biological sciences branch, master, updated. upstream/2006.dfsg.2-45-ga61f8b0

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 829a428b0927a17c030b5d890eafd9c0fcdb80fe
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Thu Jul 5 07:56:44 2012 +0800

    Manually apply patchset rather than using dpatch.

diff --git a/debian/cernlib-debian.mk b/debian/cernlib-debian.mk
index 3243fbb..c6a6ada 100644
--- a/debian/cernlib-debian.mk
+++ b/debian/cernlib-debian.mk
@@ -86,10 +86,27 @@ unpack: Makefile
 	$(MAKE) prefix=/usr mandir=/usr/share/man sysconfdir=/etc \
 		LOCAL_DEFINES='$(LOCAL_DEFINES)' stampdir/configure-stamp
 
-# Dpatch stuff
-DPATCH_STAMPFN = stampdir/patch-stamp
-${DPATCH_STAMPFN}: unpack
-include /usr/share/dpatch/dpatch.make
+patch: stampdir/patch-stamp
+stampdir/patch-stamp: unpack
+	# A hacky way to use dpatch without actually necessarily
+	# having it installed.  Patches whose name ends in .sh.dpatch
+	# are really shell scripts.
+	@set -e ; \
+	if [ -f $@ ]; then exit 0; fi; \
+	export LC_COLLATE=C ; \
+	for patch in `ls -1 $(PATCHDIR)/*.dpatch 2> /dev/null \
+		| grep -v 000-unpack.sh`; do \
+		if [ "$$patch" = "$${patch%.sh.dpatch}" ] ; then \
+			echo "Applying patch `basename $${patch%.dpatch}`..." ;\
+			patch -f -p1 < "$$patch" > /dev/null ; \
+		else \
+			echo "Running script `basename $${patch%.dpatch}`..." ;\
+			chmod a+x "$$patch" ; \
+			"$$patch" -patch ; \
+		fi ; \
+	done
+	mkdir -p stampdir
+	touch $@
 
 patched: patch
 build-arch: patch
diff --git a/debian/control b/debian/control
index db6f2cf..ae26c47 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 3.9.2
 Priority: optional
 Section: science
 Homepage: http://cernlib.web.cern.ch/cernlib/
-Build-Depends: po-debconf, dpkg-dev (>= 1.13.19), dpatch (>= 2.0.9), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), gfortran (>= 4:4.3), cfortran (>= 4.4-10), x11proto-core-dev, libxt-dev, libx11-dev, lesstif2-dev, libblas-dev, liblapack-dev
+Build-Depends: po-debconf, dpkg-dev (>= 1.13.19), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), gfortran (>= 4:4.3), cfortran (>= 4.4-10), x11proto-core-dev, libxt-dev, libx11-dev, lesstif2-dev, libblas-dev, liblapack-dev
 Vcs-Git: git://git.debian.org/git/debian-science/packages/cernlib.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cernlib.git
 
diff --git a/debian/control.d/0base.control b/debian/control.d/0base.control
index de95917..1d062da 100644
--- a/debian/control.d/0base.control
+++ b/debian/control.d/0base.control
@@ -6,7 +6,7 @@ Standards-Version: 3.9.2
 Priority: optional
 Section: science
 Homepage: http://cernlib.web.cern.ch/cernlib/
-Build-Depends: po-debconf, dpkg-dev (>= 1.13.19), dpatch (>= 2.0.9), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), gfortran (>= 4:4.3), cfortran (>= 4.4-10), x11proto-core-dev, libxt-dev, libx11-dev, lesstif2-dev, libblas-dev, liblapack-dev
+Build-Depends: po-debconf, dpkg-dev (>= 1.13.19), patch, mawk | gawk, xutils-dev, debhelper (>= 5.0.0), gfortran (>= 4:4.3), cfortran (>= 4.4-10), x11proto-core-dev, libxt-dev, libx11-dev, lesstif2-dev, libblas-dev, liblapack-dev
 Vcs-Git: git://git.debian.org/git/debian-science/packages/cernlib.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cernlib.git
 

-- 
CERNLIB is a suite of data analysis tools and libraries created for use in physics experiments, but also with applications to other fields such as the biological sciences