[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, experimental/master, updated. debian/4.00.0__dev15+12379-1-19-g8329789

[Stephane Glondu]

The following commit has been merged in the experimental/master branch:
commit 35c8c0a215b32ff4edccc726128a79a5bbe500de
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Feb 10 17:47:43 2012 +0100

    Use directly upstream tarball for "building" ocaml-source
    
    This commit changes the "interface" of the ocaml-source package: it
    now installs /usr/src/ocaml-source-$(OCAML_ABI).tar, which contains
    the .orig.tar.bz2 along with debian patches in a debian-patches/
    directory.

diff --git a/debian/ocaml-source.install.in b/debian/ocaml-source.install.in
index c561e6e..3842d34 100644
--- a/debian/ocaml-source.install.in
+++ b/debian/ocaml-source.install.in
@@ -1 +1 @@
-debian/ocaml-source- at OCamlABI@.tar.bz2 /usr/src/
+debian/ocaml-source- at OCamlABI@.tar /usr/src/
diff --git a/debian/rules b/debian/rules
index cf6fe27..115be8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ INSTDIR = $(CURDIR)/debian/tmp/usr
 DISTDIR = $(PACKAGE)-$(OCAML_ABI)
 UPSTREAM_VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/{print $$2}' | { read u; echo $${u%-*}; })
 UPSTREAM_TARBALL = ../$(PACKAGE)_$(UPSTREAM_VERSION).orig.tar.bz2
-SRCTARBALL = $(PACKAGE)-source-$(OCAML_ABI).tar.bz2
+SRCTARBALL = $(PACKAGE)-source-$(OCAML_ABI).tar
 
 TESTDIR := debian/test-build
 TESTRULES := debian/rules DEB_TEST_BUILD_PREFIX=$(CURDIR)/$(TESTDIR)
@@ -103,23 +103,14 @@ pre-config-stamp: $(TARBALL_TARGET)
 	touch $@
 
 ifneq (,$(TARBALL_TARGET))
-$(TARBALL_TARGET):
-# Make a copy of the current (patched) sources in debian/$(DISTDIR)
-	ln -fs . $(DISTDIR)	# beware of the symlink recursion!
+$(TARBALL_TARGET): $(UPSTREAM_TARBALL)
 	mkdir debian/$(DISTDIR)
-	tar --anchored -ch \
-	  --exclude=$(DISTDIR)/$(DISTDIR)	\
-	  --exclude-from=debian/ocaml-source.exclude \
-	  $(DISTDIR)/ | tar -C debian -x
-	rm -f $(DISTDIR)
-# Copy patches and unapply them
+# Copy upstream tarball
+	cp $< debian/$(DISTDIR)
+# Copy debian/patches
 	cp -a debian/patches debian/$(DISTDIR)/debian-patches
-	cd debian/$(DISTDIR) && sort -r debian-patches/series | \
-	while read u; do \
-	  patch -R -V never -p1 < debian-patches/$$u; \
-	done
 # Create the tarball and cleanup
-	tar -C debian -cjf $@ $(DISTDIR)
+	tar -C debian -cf $@ $(DISTDIR)
 	rm -Rf debian/$(DISTDIR)
 endif
 

-- 
OCaml packaging