[Pkg-ocaml-maint-commits] r2351 - in trunk/packages/spamoracle: . trunk trunk/debian upstream

Tue Jan 3 21:01:49 UTC 2006

Author: smimram
Date: 2006-01-03 21:01:47 +0000 (Tue, 03 Jan 2006)
New Revision: 2351

Added:
   trunk/packages/spamoracle/trunk/debian/svn-deblayout
   trunk/packages/spamoracle/upstream/
   trunk/packages/spamoracle/upstream/spamoracle_1.4.orig.tar.gz
Removed:
   trunk/packages/spamoracle/trunk/spamoracle_1.4.orig.tar.gz
Modified:
   trunk/packages/spamoracle/trunk/debian/
   trunk/packages/spamoracle/trunk/debian/changelog
   trunk/packages/spamoracle/trunk/debian/control
   trunk/packages/spamoracle/trunk/debian/rules
Log:
Switching to svn-buildpackage + updated.


Property changes on: trunk/packages/spamoracle/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/packages/spamoracle/trunk/debian/changelog
===================================================================

--- trunk/packages/spamoracle/trunk/debian/changelog	2006-01-03 20:41:21 UTC (rev 2350)
+++ trunk/packages/spamoracle/trunk/debian/changelog	2006-01-03 21:01:47 UTC (rev 2351)
@@ -1,3 +1,14 @@
+spamoracle (1.4-6) unstable; urgency=low
+
+  * New maintainer: Debian OCaml maintainers. Added myself to uploaders.
+  * Updated to OCaml 3.09.0.
+  * No longer hardcoding OCaml's ABI.
+  * Removed hppa from the list of supported native archs since the native
+    compiler is broken.
+  * Updated standards version to 3.6.2.
+
+ -- Samuel Mimram <smimram at debian.org>  Tue,  3 Jan 2006 21:45:38 +0100
+
 spamoracle (1.4-5) unstable; urgency=low
 
   * Rebuilt for ocaml 3.09.0.

Modified: trunk/packages/spamoracle/trunk/debian/control
===================================================================
--- trunk/packages/spamoracle/trunk/debian/control	2006-01-03 20:41:21 UTC (rev 2350)
+++ trunk/packages/spamoracle/trunk/debian/control	2006-01-03 21:01:47 UTC (rev 2351)
@@ -1,12 +1,13 @@
 Source: spamoracle
 Section: net
 Priority: optional
-Maintainer: Sven Luther <luther at debian.org>
-Build-Depends: debhelper (>> 3.0.0), ocaml-nox-3.09.0, dpatch
-Standards-Version: 3.6.1
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Sven Luther <luther at debian.org>, Samuel Mimram <smimram at debian.org>
+Build-Depends: debhelper (>> 3.0.0), ocaml-nox (>= 3.09.0), dpatch
+Standards-Version: 3.6.2
 
 Package: spamoracle
-Architecture: alpha amd64 arm hppa i386 ia64 powerpc sparc
+Architecture: alpha amd64 arm i386 ia64 powerpc sparc
 Depends: ${shlibs:Depends}
 Conflicts: spamoracle-byte
 Replaces: spamoracle-byte
@@ -25,7 +26,7 @@
 
 Package: spamoracle-byte
 Architecture: all
-Depends: ${shlibs:Depends}, ocaml-base-nox-3.09.0
+Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
 Provides: spamoracle
 Conflicts: spamoracle
 Replaces: spamoracle

Modified: trunk/packages/spamoracle/trunk/debian/rules
===================================================================
--- trunk/packages/spamoracle/trunk/debian/rules	2006-01-03 20:41:21 UTC (rev 2350)
+++ trunk/packages/spamoracle/trunk/debian/rules	2006-01-03 21:01:47 UTC (rev 2351)
@@ -9,6 +9,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+OCAMLABI := $(shell ocamlc -version)
+#OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -24,17 +27,14 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
 	#./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 	touch configure-stamp
 
 build: build-stamp
-
-build-stamp: patch-stamp configure-stamp 
+build-stamp: patch-stamp configure-stamp
 	dh_testdir
 
-	# Add here commands to compile the package.
 	#$(MAKE) OCAMLC=ocamlc spamoracle.byte
 	$(MAKE) spamoracle.byte
 	if [ -x /usr/bin/ocamlopt ]; then \
@@ -48,7 +48,6 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	# Add here commands to clean up after the build process.
 	-$(MAKE) clean
 
 	dh_clean
@@ -72,19 +71,12 @@
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
-#	dh_installdebconf -i
 	dh_installdocs -i
 	dh_installexamples -i
 	dh_installmenu -i
-#	dh_installlogrotate -i
-#	dh_installemacsen -i
-#	dh_installpam -i
-#	dh_installmime -i
-#	dh_installinit -i
-	dh_installcron -i 
+	dh_installcron -i
 	dh_installman -i spamoracle.1
-	dh_installinfo -i 
-#	dh_undocumented -i 
+	dh_installinfo -i
 	dh_installchangelogs -i
 	dh_link -i
 	dh_strip -i -Xspamoracle
@@ -96,9 +88,8 @@
 	ln -sf spamoracle \
 		$(CURDIR)/debian/spamoracle-byte/usr/share/doc/spamoracle-byte
 	dh_installdeb -i
-#	dh_perl -i
 	dh_shlibdeps -i
-	dh_gencontrol -i
+	dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums -i
 	dh_builddeb -i
 
@@ -106,20 +97,13 @@
 binary-arch: build install
 	dh_testdir -s
 	dh_testroot -s
-#	dh_installdebconf -s
 	dh_installdocs -s
 	dh_installexamples -s
 	dh_installmenu -s
-#	dh_installlogrotate -s
-#	dh_installemacsen -s
-#	dh_installpam -s
-#	dh_installmime -s
-#	dh_installinit -s
 	dh_installcron -s
 #	dh_installman -s spamoracle.1
 	dh_installman -s
 	dh_installinfo -s
-#	dh_undocumented -s
 	dh_installchangelogs -s
 	dh_link -s
 	dh_strip -s
@@ -127,11 +111,10 @@
 	dh_fixperms -s
 #	dh_makeshlibs -s
 	dh_installdeb -s
-#	dh_perl -s
 	dh_shlibdeps -s
-	dh_gencontrol -s
+	dh_gencontrol -s -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums -s
-	dh_builddeb -s 
+	dh_builddeb -s
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

Added: trunk/packages/spamoracle/trunk/debian/svn-deblayout
===================================================================
--- trunk/packages/spamoracle/trunk/debian/svn-deblayout	2006-01-03 20:41:21 UTC (rev 2350)
+++ trunk/packages/spamoracle/trunk/debian/svn-deblayout	2006-01-03 21:01:47 UTC (rev 2351)
@@ -0,0 +1,3 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/spamoracle/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/spamoracle

Deleted: trunk/packages/spamoracle/trunk/spamoracle_1.4.orig.tar.gz
===================================================================
(Binary files differ)

Copied: trunk/packages/spamoracle/upstream/spamoracle_1.4.orig.tar.gz (from rev 2350, trunk/packages/spamoracle/trunk/spamoracle_1.4.orig.tar.gz)


