[Pkg-ocaml-maint-commits] r4165 - in /trunk/packages/ocaml/trunk/debian: changelog compat control ocaml-source.install.in rules

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Aug 12 17:29:46 2007
New Revision: 4165

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4165
Log:
* ocaml-source: install ocaml tarball as
  /usr/src/ocaml-source-VERSION.tar.bz2; the "-source" part was erroneously
  missing and make other packages FTBFS
* bump debhelper dependencies and compatibility level to 5

Modified:
    trunk/packages/ocaml/trunk/debian/changelog
    trunk/packages/ocaml/trunk/debian/compat
    trunk/packages/ocaml/trunk/debian/control
    trunk/packages/ocaml/trunk/debian/ocaml-source.install.in
    trunk/packages/ocaml/trunk/debian/rules

Modified: trunk/packages/ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/changelog?rev=4165&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/changelog (original)
+++ trunk/packages/ocaml/trunk/debian/changelog Sun Aug 12 17:29:46 2007
@@ -1,4 +1,4 @@
-ocaml (3.10.0-5) UNRELEASED; urgency=low
+ocaml (3.10.0-5) experimental; urgency=low
 
   [ Ralf Treinen ]
   * ocaml-mode.emacsen-install: do not hardcode the emacs flavours for which
@@ -8,8 +8,12 @@
   [ Stefano Zacchiroli ]
   * add patch arm_ccheckbound_typo, fix a typing error typo which makes ocaml
     FTBFS on arm
-
- -- Stefano Zacchiroli <zack at debian.org>  Wed, 25 Jul 2007 17:52:23 +0200
+  * ocaml-source: install ocaml tarball as
+    /usr/src/ocaml-source-VERSION.tar.bz2; the "-source" part was erroneously
+    missing and make other packages FTBFS
+  * bump debhelper dependencies and compatibility level to 5
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 12 Aug 2007 19:29:07 +0200
 
 ocaml (3.10.0-4) experimental; urgency=low
 

Modified: trunk/packages/ocaml/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/compat?rev=4165&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/compat (original)
+++ trunk/packages/ocaml/trunk/debian/compat Sun Aug 12 17:29:46 2007
@@ -1,1 +1,1 @@
-4
+5

Modified: trunk/packages/ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/control?rev=4165&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/control (original)
+++ trunk/packages/ocaml/trunk/debian/control Sun Aug 12 17:29:46 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sven Luther <luther at debian.org>, Stefano Zacchiroli <zack at debian.org>, Julien Cristau <julien.cristau at ens-lyon.org>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.2), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils
+Build-Depends: debhelper (>> 5.0.0), tcl8.4-dev, tk8.4-dev, libncurses5-dev, libgdbm-dev, dpatch, bzip2, docbook-xml, docbook-utils
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/

Modified: trunk/packages/ocaml/trunk/debian/ocaml-source.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/ocaml-source.install.in?rev=4165&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-source.install.in (original)
+++ trunk/packages/ocaml/trunk/debian/ocaml-source.install.in Sun Aug 12 17:29:46 2007
@@ -1,1 +1,1 @@
-debian/ocaml-#OcamlABI#.tar.bz2		/usr/src/
+debian/ocaml-source-#OcamlABI#.tar.bz2		/usr/src/

Modified: trunk/packages/ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml/trunk/debian/rules?rev=4165&op=diff
==============================================================================
--- trunk/packages/ocaml/trunk/debian/rules (original)
+++ trunk/packages/ocaml/trunk/debian/rules Sun Aug 12 17:29:46 2007
@@ -11,6 +11,7 @@
 
 NATIVE_ARCHS = $(shell cat debian/native-archs)
 DISTDIR = $(PACKAGE)-$(OCAMLMAJOR).$(OCAMLMINOR)
+SRCTARBALL = $(PACKAGE)-source-$(OCAMLMAJOR).$(OCAMLMINOR).tar.bz2
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -52,11 +53,11 @@
 debian/control:
 	sed -e 's/#OcamlNativeArchs#/$(NATIVE_ARCHS)/g' debian/control.in > $@
 
-pre-config: debian/$(DISTDIR).tar.bz2
+pre-config: debian/$(SRCTARBALL)
 	touch $@
-debian/$(DISTDIR).tar.bz2:
+debian/$(SRCTARBALL):
 	ln -fs . $(DISTDIR)	# beware of the symlink recursion!
-	tar --anchored -chjf debian/$(DISTDIR).tar.bz2 \
+	tar --anchored -chjf $@ \
 		--exclude=$(DISTDIR)/$(DISTDIR)	\
 		--exclude-from=debian/ocaml-source.exclude \
 		$(DISTDIR)/
@@ -139,7 +140,7 @@
 
 	dh_clean debian/README.labltk camlp4/config/Makefile.cnf camlp4/config/Makefile config/m.h config/s.h config/Makefile emacs/ocamltags driver/ocamlcomp.sh
 	debian/rules abi-sed-clean
-	rm -f debian/$(DISTDIR).tar.bz2
+	rm -f debian/$(SRCTARBALL)
 
 install: install-indep install-arch
 install-indep: build-indep