[Pkg-ocaml-maint-commits] [SCM] spamoracle packaging branch, master, updated. debian/1.4-14
Sylvain Le Gall
gildor at debian.org
Thu Jul 2 08:05:22 UTC 2009
The following commit has been merged in the master branch:
commit 9f8e6f4aaa3f282aeb9bf3ad1e4e3c2fb615e073
Author: Sylvain Le Gall <gildor at debian.org>
Date: Thu Jul 2 09:53:18 2009 +0200
Remove package spamoracle-byte
diff --git a/debian/README.Debian-source b/debian/README.Debian-source
index 6d67560..7ef26c3 100644
--- a/debian/README.Debian-source
+++ b/debian/README.Debian-source
@@ -1,17 +1,5 @@
-debian/control.in
-=================
+This package use dpatch for patching the source.
-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).
+Please consider reading dpatch manpage to patch the source.
-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
+ -- Sylvain Le Gall <gildor at debian.org> Tue, 30 Jun 2009 22:11:24 +0000
diff --git a/debian/changelog b/debian/changelog
index 4084572..a6b738f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+spamoracle (1.4-14) unstable; urgency=low
+
+ * Update debian/copyright with
+ http://wiki.debian.org/Proposals/CopyrightFormat
+ * Remove package spamoracle-byte, now spamoracle provides either native or
+ bytecode version, depending on architecture.
+
+ -- Sylvain Le Gall <gildor at debian.org> Tue, 30 Jun 2009 19:47:11 +0000
+
spamoracle (1.4-13) unstable; urgency=low
[ Samuel Mimram ]
diff --git a/debian/control b/debian/control
index 89f5e91..a9ac64e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,10 +9,11 @@ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/spamoracle.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/spamoracle.git
Package: spamoracle
-Architecture: amd64 hurd-i386 i386 kfreebsd-i386 lpia powerpc sparc
-Depends: ${shlibs:Depends}
+Architecture: any
+Depends: ${shlibs:Depends}, ${F:OCamlInterpreter}
Conflicts: spamoracle-byte
Replaces: spamoracle-byte
+Provides: spamoracle-byte
Description: A statistical analysis spam filter based on Bayes' formula
SpamOracle, a.k.a. "Saint Peter", is a tool to help detect and filter away
"spam" (unsolicited commercial e-mail). It proceeds by statistical analysis
@@ -26,24 +27,3 @@ Description: A statistical analysis spam filter based on Bayes' formula
yes, no or unknown, plus additional details. A procmail rule can then test
this X-Spam: header and deliver the e-mail to the appropriate mailbox.
-Package: spamoracle-byte
-Architecture: all
-Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
-Provides: spamoracle
-Conflicts: spamoracle
-Replaces: spamoracle
-Description: A statistical analysis spam filter based on Bayes' formula
- SpamOracle, a.k.a. "Saint Peter", is a tool to help detect and filter away
- "spam" (unsolicited commercial e-mail). It proceeds by statistical analysis
- of the words that appear in the e-mail, comparing the frequencies of words
- with those found in a user-provided corpus of known spam and known legitimate
- e-mail. The classification algorithm is based on Bayes' formula, and is
- described in Paul Graham's paper, A plan for spam.
- .
- This program is designed to work in conjunction with procmail. The result of
- the analysis is output as an additional message header X-Spam:, followed by
- yes, no or unknown, plus additional details. A procmail rule can then test
- this X-Spam: header and deliver the e-mail to the appropriate mailbox.
- .
- This package contains the arch independent bytecode version. Consider using
- the faster nativecode version if it is available on your arch.
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index eb04ad7..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,49 +0,0 @@
-Source: spamoracle
-Section: net
-Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 7), dh-ocaml, ocaml-nox (>= 3.11), dpatch
-Standards-Version: 3.8.0
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/spamoracle.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/spamoracle.git
-
-Package: spamoracle
-Architecture: @OCamlNativeArchs@
-Depends: ${shlibs:Depends}
-Conflicts: spamoracle-byte
-Replaces: spamoracle-byte
-Description: A statistical analysis spam filter based on Bayes' formula
- SpamOracle, a.k.a. "Saint Peter", is a tool to help detect and filter away
- "spam" (unsolicited commercial e-mail). It proceeds by statistical analysis
- of the words that appear in the e-mail, comparing the frequencies of words
- with those found in a user-provided corpus of known spam and known legitimate
- e-mail. The classification algorithm is based on Bayes' formula, and is
- described in Paul Graham's paper, A plan for spam.
- .
- This program is designed to work in conjunction with procmail. The result of
- the analysis is output as an additional message header X-Spam:, followed by
- yes, no or unknown, plus additional details. A procmail rule can then test
- this X-Spam: header and deliver the e-mail to the appropriate mailbox.
-
-Package: spamoracle-byte
-Architecture: all
-Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
-Provides: spamoracle
-Conflicts: spamoracle
-Replaces: spamoracle
-Description: A statistical analysis spam filter based on Bayes' formula
- SpamOracle, a.k.a. "Saint Peter", is a tool to help detect and filter away
- "spam" (unsolicited commercial e-mail). It proceeds by statistical analysis
- of the words that appear in the e-mail, comparing the frequencies of words
- with those found in a user-provided corpus of known spam and known legitimate
- e-mail. The classification algorithm is based on Bayes' formula, and is
- described in Paul Graham's paper, A plan for spam.
- .
- This program is designed to work in conjunction with procmail. The result of
- the analysis is output as an additional message header X-Spam:, followed by
- yes, no or unknown, plus additional details. A procmail rule can then test
- this X-Spam: header and deliver the e-mail to the appropriate mailbox.
- .
- This package contains the arch independent bytecode version. Consider using
- the faster nativecode version if it is available on your arch.
diff --git a/debian/copyright b/debian/copyright
index 65131a2..f4690b7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,14 @@
-This package was debianized by Sven Luther <luther at debian.org> on
-Sun, 20 Oct 2002 11:38:39 +0200
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Author: Xavier Leroy <xavier.leroy at inria.fr>
+Packaged-By: Sven Luther <luther at debian.org>
+Packaged-Date: Sun, 20 Oct 2002 11:38:39 +0200
+Original-Source-Location: http://pauillac.inria.fr/~xleroy/software.html#spamoracle
-It was downloaded from :
- http://pauillac.inria.fr/~xleroy/software.html#spamoracle
+Files: *
+Copyright: (C) 2002, Institut National de Recherche en Informatique et en
+ Automatique
+License: GPL-2
-Upstream Author: Xavier Leroy <xavier.leroy at inria.fr>
+This file is distributed under the terms of the GNU Public License version 2,
+which you may find in /usr/share/common-licenses/GPL-2 on debian systems.
-Copyright:
-
-Copyright 2002 Institut National de Recherche en Informatique et
-en Automatique. This file is distributed under the terms of the
-GNU Public License version 2, which you may find in
-/usr/share/common-licenses/GPL-2 on debian systems
diff --git a/debian/rules b/debian/rules
index 38b9759..3c5fcec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,6 @@ include /usr/share/dpatch/dpatch.make
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# 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)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
@@ -20,34 +15,29 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+OCAML_INTERPRETER=
+else
+OCAML_INTERPRETER=ocaml-base-nox-$(OCAML_ABI)
+endif
-debian/control: debian/control.in
- sed \
- -e 's, at OCamlNativeArchs@,$(OCAML_NATIVE_ARCHS),g' \
- $< > $@
+configure:
build: build-stamp
-build-stamp: patch-stamp configure-stamp
+build-stamp: patch-stamp
dh_testdir
-
- $(MAKE) spamoracle.byte
-ifneq ($(OCAML_OPT_ARCH),)
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
$(MAKE) spamoracle
+else
+ $(MAKE) spamoracle.byte
endif
-
touch build-stamp
clean: unpatch
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
-
+ rm -f build-stamp
$(MAKE) clean
-
dh_clean
install: build
@@ -55,62 +45,33 @@ install: build
dh_testroot
dh_prep
dh_installdirs
-
-ifneq ($(OCAML_OPT_ARCH),)
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
$(MAKE) install DESTDIR=$(CURDIR)/debian/spamoracle
+else
+ $(MAKE) install.byte DESTDIR=$(CURDIR)/debian/spamoracle
endif
- $(MAKE) install.byte DESTDIR=$(CURDIR)/debian/spamoracle-byte
- 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
- dh_testroot -i
- dh_installdocs -i
- dh_installexamples -i
- dh_installmenu -i
- dh_installcron -i
- dh_installman -i spamoracle.1
- dh_installinfo -i
- dh_installchangelogs -i
- dh_link -i
- dh_strip -i -Xspamoracle
- dh_compress -i
- dh_fixperms -i
-# dh_makeshlibs -i
- mv $(CURDIR)/debian/spamoracle-byte/usr/share/doc/spamoracle-byte \
- $(CURDIR)/debian/spamoracle-byte/usr/share/doc/spamoracle
- ln -sf spamoracle \
- $(CURDIR)/debian/spamoracle-byte/usr/share/doc/spamoracle-byte
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i -- -VF:OCamlABI="$(OCAML_ABI)"
- dh_md5sums -i
- dh_builddeb -i
+binary-indep:
-# Build architecture-dependent files here.
binary-arch: build install
- # fails if ocamlopt is missing, in such cases binary-arch shouldn't have been invoked
- test -x /usr/bin/ocamlopt
dh_testdir -s
dh_testroot -s
dh_installdocs -s
dh_installexamples -s
dh_installmenu -s
dh_installcron -s
-# dh_installman -s spamoracle.1
dh_installman -s
dh_installinfo -s
dh_installchangelogs -s
dh_link -s
- dh_strip -s
+ dh_strip -s -X spamoracle.byte
dh_compress -s
dh_fixperms -s
-# dh_makeshlibs -s
dh_installdeb -s
dh_shlibdeps -s
- dh_gencontrol -s -- -VF:OCamlABI="$(OCAML_ABI)"
+ dh_gencontrol -s -- \
+ -VF:OCamlABI="$(OCAML_ABI)" \
+ -VF:OCamlInterpreter="$(OCAML_INTERPRETER)"
dh_md5sums -s
dh_builddeb -s
diff --git a/debian/spamoracle-byte.dirs b/debian/spamoracle-byte.dirs
deleted file mode 100644
index 8b7a83b..0000000
--- a/debian/spamoracle-byte.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin
-usr/share/man/man1
-usr/share/man/man5
-usr/share/lintian/overrides
diff --git a/debian/spamoracle-byte.docs b/debian/spamoracle-byte.docs
deleted file mode 100644
index e845566..0000000
--- a/debian/spamoracle-byte.docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/spamoracle-byte.override b/debian/spamoracle-byte.override
deleted file mode 100644
index 00a1ca8..0000000
--- a/debian/spamoracle-byte.override
+++ /dev/null
@@ -1 +0,0 @@
-spamoracle-byte: usr-doc-symlink-without-dependency spamoracle
diff --git a/debian/spamoracle-byte.postinst b/debian/spamoracle-byte.postinst
deleted file mode 100644
index 8edfcde..0000000
--- a/debian/spamoracle-byte.postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "configure" ]; then
- rm -rf /usr/share/doc/spamoracle-byte.moved-by-preinst
-fi
-
-#DEBHELPER#
diff --git a/debian/spamoracle-byte.postrm b/debian/spamoracle-byte.postrm
deleted file mode 100644
index 400169c..0000000
--- a/debian/spamoracle-byte.postrm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh -e
-
-case $1 in
- abort-install|abort-upgrade)
- if [ -d /usr/share/doc/spamoracle-byte.moved-by-preinst ]; then
- mv /usr/share/doc/spamoracle-byte.moved-by-preinst \
- /usr/share/doc/spamoracle-byte
- fi
- ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/spamoracle-byte.preinst b/debian/spamoracle-byte.preinst
deleted file mode 100644
index 151d4dc..0000000
--- a/debian/spamoracle-byte.preinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
- install|upgrade)
- if [ -n "$2" ] && dpkg --compare-versions "$2" lt "1.2-5"
- then
- if [ -d /usr/share/doc/spamoracle-byte ]; then
- mv /usr/share/doc/spamoracle-byte \
- /usr/share/doc/spamoracle-byte.moved-by-preinst
- fi
- fi
- ;;
-esac
-
-#DEBHELPER#
--
spamoracle packaging
More information about the Pkg-ocaml-maint-commits
mailing list