[Pkg-ocaml-maint-commits] r5308 - in /trunk/packages/spamoracle/trunk/debian: README.Debian-source changelog control control.in rules

Thu Mar 6 15:06:37 UTC 2008

Author: zack
Date: Thu Mar  6 15:06:37 2008
New Revision: 5308

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5308
Log:
* add debian/control.in with the usual indirection to fill the Architecture
  field with the current list of architectures supported by the native code
  compiler (Closes: #469671)
* add debian/README.Debian-source documenting the above change
* make debian/rules fail when binary-arch is invoked on architectures which
  are missing /usr/bin/ocamlopt. It should never happen and probably will
  only if in the future we drop some more OCaml native architectures and
  forget to update this package

Added:
    trunk/packages/spamoracle/trunk/debian/README.Debian-source
    trunk/packages/spamoracle/trunk/debian/control.in
      - copied, changed from r5307, trunk/packages/spamoracle/trunk/debian/control
Modified:
    trunk/packages/spamoracle/trunk/debian/changelog
    trunk/packages/spamoracle/trunk/debian/control
    trunk/packages/spamoracle/trunk/debian/rules

Added: trunk/packages/spamoracle/trunk/debian/README.Debian-source
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/spamoracle/trunk/debian/README.Debian-source?rev=5308&op=file
==============================================================================

--- trunk/packages/spamoracle/trunk/debian/README.Debian-source (added)
+++ trunk/packages/spamoracle/trunk/debian/README.Debian-source Thu Mar  6 15:06:37 2008
@@ -1,0 +1,17 @@
+debian/control.in
+=================
+
+To keep up to date the list of architectures supported by the OCaml native code
+compiler (i.e. the only architectures where "spamoracle" should be built), this
+package uses debian/control.in as an indirection wrt debian/control. However,
+debian/control is not created from it as build-time, as this is bad(TM).
+
+To create the debian/control from debian/control.in it is enough to do:
+
+    debian/rules debian/control
+
+You should do that *before* creating the source package. And remember to NEVER
+CHANGE debian/control BY HAND, RATHER CHANGE debian/control.in AND THEN RUN THE
+COMMAND ABOVE.
+
+ -- Stefano Zacchiroli <zack at debian.org>  Thu, 06 Mar 2008 16:03:56 +0100

Modified: trunk/packages/spamoracle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/spamoracle/trunk/debian/changelog?rev=5308&op=diff
==============================================================================
--- trunk/packages/spamoracle/trunk/debian/changelog (original)
+++ trunk/packages/spamoracle/trunk/debian/changelog Thu Mar  6 15:06:37 2008
@@ -1,8 +1,15 @@
-spamoracle (1.4-11) UNRELEASED; urgency=low
+spamoracle (1.4-11) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * add debian/control.in with the usual indirection to fill the Architecture
+    field with the current list of architectures supported by the native code
+    compiler (Closes: #469671)
+  * add debian/README.Debian-source documenting the above change
+  * make debian/rules fail when binary-arch is invoked on architectures which
+    are missing /usr/bin/ocamlopt. It should never happen and probably will
+    only if in the future we drop some more OCaml native architectures and
+    forget to update this package
 
- -- Stefano Zacchiroli <zack at debian.org>  Sun, 02 Mar 2008 15:39:50 +0100
+ -- Stefano Zacchiroli <zack at debian.org>  Thu, 06 Mar 2008 16:05:54 +0100
 
 spamoracle (1.4-10) unstable; urgency=medium
 

Modified: trunk/packages/spamoracle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/spamoracle/trunk/debian/control?rev=5308&op=diff
==============================================================================
--- trunk/packages/spamoracle/trunk/debian/control (original)
+++ trunk/packages/spamoracle/trunk/debian/control Thu Mar  6 15:06:37 2008
@@ -9,7 +9,7 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/spamoracle/trunk/
 
 Package: spamoracle
-Architecture: alpha amd64 arm armeb armel i386 ia64 kfreebsd-i386 powerpc sparc
+Architecture: amd64 hurd-i386 i386 kfreebsd-i386 powerpc sparc
 Depends: ${shlibs:Depends}
 Conflicts: spamoracle-byte
 Replaces: spamoracle-byte

Copied: trunk/packages/spamoracle/trunk/debian/control.in (from r5307, trunk/packages/spamoracle/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/spamoracle/trunk/debian/control.in?rev=5308&op=diff
==============================================================================
--- trunk/packages/spamoracle/trunk/debian/control (original)
+++ trunk/packages/spamoracle/trunk/debian/control.in Thu Mar  6 15:06:37 2008
@@ -9,7 +9,7 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/spamoracle/trunk/
 
 Package: spamoracle
-Architecture: alpha amd64 arm armeb armel i386 ia64 kfreebsd-i386 powerpc sparc
+Architecture: @OCamlNativeArchs@
 Depends: ${shlibs:Depends}
 Conflicts: spamoracle-byte
 Replaces: spamoracle-byte

Modified: trunk/packages/spamoracle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/spamoracle/trunk/debian/rules?rev=5308&op=diff
==============================================================================
--- trunk/packages/spamoracle/trunk/debian/rules (original)
+++ trunk/packages/spamoracle/trunk/debian/rules Thu Mar  6 15:06:37 2008
@@ -10,7 +10,8 @@
 #export DH_VERBOSE=1
 
 OCAMLABI := $(shell ocamlc -version)
-#OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+OCAML_STDLIB_DIR := $(shell /usr/bin/ocamlc -where)
+OCAML_NATIVE_ARCHS := $(shell cat $(OCAML_STDLIB_DIR)/native-archs)
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -27,15 +28,17 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	#./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	touch configure-stamp
 
-	touch configure-stamp
+debian/control: debian/control.in
+	sed \
+		-e 's, at OCamlNativeArchs@,$(OCAML_NATIVE_ARCHS),g' \
+		$< > $@
 
 build: build-stamp
 build-stamp: patch-stamp configure-stamp
 	dh_testdir
 
-	#$(MAKE) OCAMLC=ocamlc spamoracle.byte
 	$(MAKE) spamoracle.byte
 	if [ -x /usr/bin/ocamlopt ]; then \
 		$(MAKE) spamoracle; \
@@ -66,7 +69,6 @@
 	install -m 644 debian/spamoracle-byte.override \
 		$(CURDIR)/debian/spamoracle-byte/usr/share/lintian/overrides/spamoracle-byte
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i
@@ -95,6 +97,8 @@
 
 # Build architecture-dependent files here.
 binary-arch: build install
+	# fail without ocamlopt, this target shouldn't have been invoked!
+	test -x /usr/bin/ocamlopt
 	dh_testdir -s
 	dh_testroot -s
 	dh_installdocs -s
@@ -118,3 +122,4 @@
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
+


