[Pkg-ocaml-maint-commits] r3230 - in
/trunk/packages/headache/trunk/debian: changelog compat control
control.in patches/00list patches/01_detect_end_of_header.dpatch rules
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Tue Oct 10 23:14:52 UTC 2006
Author: gildor
Date: Tue Oct 10 23:14:52 2006
New Revision: 3230
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3230
Log:
* Acknowledge NMU,
* Move to CDBS,
-- SLG
Added:
trunk/packages/headache/trunk/debian/patches/01_detect_end_of_header.dpatch
Modified:
trunk/packages/headache/trunk/debian/changelog
trunk/packages/headache/trunk/debian/compat
trunk/packages/headache/trunk/debian/control
trunk/packages/headache/trunk/debian/control.in
trunk/packages/headache/trunk/debian/patches/00list
trunk/packages/headache/trunk/debian/rules
Modified: trunk/packages/headache/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/changelog?rev=3230&op=diff
==============================================================================
--- trunk/packages/headache/trunk/debian/changelog (original)
+++ trunk/packages/headache/trunk/debian/changelog Tue Oct 10 23:14:52 2006
@@ -1,8 +1,20 @@
headache (1.03-9) unstable; urgency=low
- * Update upstream mail
+ * Update upstream mail,
+ * Acknowledge NMU, thanks Mohammed Adnène Trojette (Closes: #388002, #379146)
+ * Use CDBS for debian/rules,
+ * Upgrade debhelper debian/compat to 5,
- -- Sylvain Le Gall <gildor at debian.org> Fri, 15 Sep 2006 00:42:28 +0200
+ -- Sylvain Le Gall <gildor at debian.org> Wed, 11 Oct 2006 00:43:04 +0200
+
+headache (1.03-8.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * 01_detect_end_of_header.dpatch:
+ + patch from Julien Cristau to detect the end of
+ the header (Closes: #379146)
+
+ -- Mohammed Adnène Trojette <adn+deb at diwi.org> Mon, 18 Sep 2006 02:37:52 +0200
headache (1.03-8) unstable; urgency=low
Modified: trunk/packages/headache/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/compat?rev=3230&op=diff
==============================================================================
--- trunk/packages/headache/trunk/debian/compat (original)
+++ trunk/packages/headache/trunk/debian/compat Tue Oct 10 23:14:52 2006
@@ -1,1 +1,1 @@
-4
+5
Modified: trunk/packages/headache/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/control?rev=3230&op=diff
==============================================================================
--- trunk/packages/headache/trunk/debian/control (original)
+++ trunk/packages/headache/trunk/debian/control Tue Oct 10 23:14:52 2006
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
Build-Depends-Indep: ocaml-nox-3.09.2, po-debconf, xsltproc, docbook-xsl, docbook-xml
-Build-Depends: debhelper (>= 4.0), dpatch
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/headache
+XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/headache
Package: headache
Architecture: all
Modified: trunk/packages/headache/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/control.in?rev=3230&op=diff
==============================================================================
--- trunk/packages/headache/trunk/debian/control.in (original)
+++ trunk/packages/headache/trunk/debian/control.in Tue Oct 10 23:14:52 2006
@@ -2,8 +2,8 @@
Section: devel
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends-Indep: ocaml-nox-#OCamlABI#, po-debconf, xsltproc, docbook-xsl, docbook-xml
-Build-Depends: debhelper (>= 4.0), dpatch
+Build-Depends-Indep: ocaml-nox-3.09.2, po-debconf, xsltproc, docbook-xsl, docbook-xml
+Build-Depends: @cdbs@
Standards-Version: 3.7.2
XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/headache
Modified: trunk/packages/headache/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/patches/00list?rev=3230&op=diff
==============================================================================
--- trunk/packages/headache/trunk/debian/patches/00list (original)
+++ trunk/packages/headache/trunk/debian/patches/00list Tue Oct 10 23:14:52 2006
@@ -1,2 +1,1 @@
-
-
+01_detect_end_of_header
Added: trunk/packages/headache/trunk/debian/patches/01_detect_end_of_header.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/patches/01_detect_end_of_header.dpatch?rev=3230&op=file
==============================================================================
--- trunk/packages/headache/trunk/debian/patches/01_detect_end_of_header.dpatch (added)
+++ trunk/packages/headache/trunk/debian/patches/01_detect_end_of_header.dpatch Tue Oct 10 23:14:52 2006
@@ -1,0 +1,51 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_detect_end_of_header.patch.dpatch by Julien Cristau <julien.cristau at ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to detect the end of the header
+
+ at DPATCH@
+
+diff -Nru headache-1.03/main.ml headache-1.03.new/main.ml
+--- headache-1.03/main.ml 2004-03-29 11:16:22.000000000 +0200
++++ headache-1.03.new/main.ml 2006-09-16 01:57:34.000000000 +0200
+@@ -89,7 +89,7 @@
+ let line = input_line ic in
+ line :: loop ()
+ with
+- End_of_file -> []
++ End_of_file -> close_in ic; []
+ in
+ loop ()
+
+@@ -221,4 +221,4 @@
+ main ()
+ with
+ Sys_error msg ->
+- eprintf "%s: %s" Sys.argv.(0) msg
++ eprintf "%s: %s\n" Sys.argv.(0) msg
+diff -Nru headache-1.03/model.ml headache-1.03.new/model.ml
+--- headache-1.03/model.ml 2004-03-29 11:16:22.000000000 +0200
++++ headache-1.03.new/model.ml 2006-09-16 01:47:06.000000000 +0200
+@@ -138,6 +138,8 @@
+ let regexp_end =
+ Str.regexp_string (sprintf "%s%s" (String.make 10 line_char) close_comment)
+ in
++ let end_length = 10 + String.length close_comment
++ in
+
+ let regexp_blank = Str.regexp "^[ ]*$" in
+
+@@ -146,7 +148,11 @@
+ let line = input_line ic in
+ if Str.string_match regexp_begin line 0
+ then begin
+- while not (Str.string_match regexp_end (input_line ic) 0) do () done;
++ while
++ let s = input_line ic in
++ not (Str.string_match regexp_end s
++ (max 0 (String.length s - end_length)))
++ do () done;
+ ""
+ end
+ else if Str.string_match regexp_blank line 0
Modified: trunk/packages/headache/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/headache/trunk/debian/rules?rev=3230&op=diff
==============================================================================
--- trunk/packages/headache/trunk/debian/rules (original)
+++ trunk/packages/headache/trunk/debian/rules Tue Oct 10 23:14:52 2006
@@ -1,57 +1,93 @@
#!/usr/bin/make -f
+# debian/rules for headache package
+# Copyright (C) 2006 Sylvain Le Gall <gildor at debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
-include /usr/share/dpatch/dpatch.make
+# Generate debian/control using
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
-PACKAGE=headache
-OCAMLABI=$(shell ocamlc -version)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/autotools.mk
-debian/control: debian/control.in
- sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- ./configure --bindir=$(CURDIR)/debian/headache/usr/bin/
- touch configure-stamp
+DEB_MAKE_CLEAN_TARGET := clean
+DEB_MAKE_BUILD_TARGET :=
+DEB_MAKE_INSTALL_TARGET := install INSTALLDIR="$(DEB_DESTDIR)/usr/bin"
-build: configure-stamp patch-stamp build-stamp
-build-stamp:
- dh_testdir
- $(MAKE)
- cd debian/xml-man && $(MAKE)
- touch build-stamp
+clean::
+ -$(DEB_MAKE_ENVVARS) $(MAKE) -C debian/xml-man clean
-clean: unpatch
- dh_testdir
- dh_testroot
- -$(MAKE) clean
- -cd debian/xml-man && $(MAKE) clean
- rm -f build-stamp configure-stamp
- dh_clean
+build/headache::
+ $(DEB_MAKE_ENVVARS) $(MAKE) -C debian/xml-man all
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) install
+OCAMLABI = $(shell ocamlc -version)
+DEB_DH_GENCONTROL_ARGS += -- -VF:OCamlABI="$(OCAMLABI)"
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installdocs -i
- dh_installman -i
- dh_installchangelogs -i
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure debian/control
+#include /usr/share/dpatch/dpatch.make
+#
+#PACKAGE=headache
+#
+#debian/control: debian/control.in
+# sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
+#
+#configure: configure-stamp
+#configure-stamp:
+# dh_testdir
+# ./configure --bindir=$(CURDIR)/debian/headache/usr/bin/
+# touch configure-stamp
+#
+#build: configure-stamp patch-stamp build-stamp
+#build-stamp:
+# dh_testdir
+# $(MAKE)
+# cd debian/xml-man && $(MAKE)
+# touch build-stamp
+#
+#clean: unpatch
+# dh_testdir
+# dh_testroot
+# -$(MAKE) clean
+# -cd debian/xml-man && $(MAKE) clean
+# rm -f build-stamp configure-stamp
+# dh_clean
+#
+#install: build
+# dh_testdir
+# dh_testroot
+# dh_clean -k
+# dh_installdirs
+# $(MAKE) install
+#
+#binary-indep: build install
+# dh_testdir -i
+# dh_testroot -i
+# dh_installdocs -i
+# dh_installman -i
+# dh_installchangelogs -i
+# dh_link -i
+# dh_compress -i
+# dh_fixperms -i
+# dh_installdeb -i
+# dh_shlibdeps -i
+# dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
+# dh_md5sums -i
+# dh_builddeb -i
+#
+#binary-arch: build install
+#
+#binary: binary-indep binary-arch
+#.PHONY: build clean binary-indep binary-arch binary install configure debian/control
More information about the Pkg-ocaml-maint-commits
mailing list