[Pkg-ocaml-maint-commits] [SCM] pcre-ocaml packaging branch, master, updated. debian/6.0.1-2-5-ge0b1f52

Stefano Zacchiroli zack at upsilon.cc
Thu Apr 8 20:16:05 UTC 2010 

The following commit has been merged in the master branch:
commit e0b1f52c00afa4876bb2026498477a5b80ce9a51
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Thu Apr 8 21:57:13 2010 +0200

    patch management: switch from dpatch to quilt

diff --git a/debian/README.source b/debian/README.source
index be699fb..e064e85 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,20 +1,7 @@
----------------------------------
-+ pcre-ocaml package for Debian +
----------------------------------
-
-
-Patch system
+patch system
 ------------
 
-This package uses dpatch for patching the source. Please consider
-reading dpatch manpage to patch the source.
-
-
-Version Control System
-----------------------
-
-Packaging is versioned with git, using git-import-orig and
-git-buildpackage. Please consider reading the documentation of these
-tools.
+This package now uses quilt for patching the source. Please read
+/usr/share/doc/quilt/README.source for more information.
 
-It was versioned with subversion until Sat, 09 Aug 2008.
+ -- Stefano Zacchiroli <zack at debian.org>, Thu,  8 Apr 2010 22:02:39 +0200
diff --git a/debian/changelog b/debian/changelog
index 794f2b4..bd7b8b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ pcre-ocaml (6.0.1-3) unstable; urgency=low
   
   [ Stefano Zacchiroli ]
   * Bump Standards-Version to 3.8.4 (no changes)
+  * debian/source/format: set source format to 3.0 (quilt)
+  * switch patch management from dpatch to quilt
+  * debian/patches: remove unused meta.dpatch
 
  -- Stefano Zacchiroli <zack at debian.org>  Thu, 08 Apr 2010 21:50:07 +0200
 
diff --git a/debian/control b/debian/control
index 24f2b0c..83e70de 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  ocaml-nox (>= 3.11.1-3~),
  ocaml-findlib (>= 1.2.5),
  cdbs,
- dpatch,
+ quilt,
  dh-ocaml (>= 0.9)
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pcre-ocaml.git
diff --git a/debian/patches/build.dpatch b/debian/patches/0001-enable-byte-only-build.patch
old mode 100755
new mode 100644
similarity index 58%
rename from debian/patches/build.dpatch
rename to debian/patches/0001-enable-byte-only-build.patch
index 8d5467d..4746776
--- a/debian/patches/build.dpatch
+++ b/debian/patches/0001-enable-byte-only-build.patch
@@ -1,15 +1,19 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build.dpatch by  <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: split the build process among native and non native targets, introducing
-## DP: the new opt target; it will be invoked only if /usr/bin/ocamlopt exists
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Thu, 8 Apr 2010 22:05:57 +0200
+Subject: [PATCH] enable byte only build
 
- at DPATCH@
-diff -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile	2007-08-27 05:20:48.000000000 +0200
-+++ trunk/Makefile	2007-09-02 16:36:17.000000000 +0200
-@@ -4,8 +4,13 @@
+split the build process among native and non native targets, introducing the
+new opt target; it will be invoked only if /usr/bin/ocamlopt exists
+---
+ Makefile      |    5 +++++
+ OCamlMakefile |   13 ++++++++++---
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 880d68f..a3c84ed 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,8 +4,13 @@ EXAMPLES = $(filter-out examples/OMakefile examples/CVS, $(wildcard examples/*))
  
  .PHONY: all
  all:
@@ -23,10 +27,11 @@ diff -urNad trunk~/Makefile trunk/Makefile
  .PHONY:	examples
  examples:
  	@for dir in $(EXAMPLES); do (cd $$dir && $(MAKE)); done
-diff -urNad trunk~/OCamlMakefile trunk/OCamlMakefile
---- trunk~/OCamlMakefile	2007-08-27 05:20:48.000000000 +0200
-+++ trunk/OCamlMakefile	2007-09-02 16:37:08.000000000 +0200
-@@ -498,8 +498,14 @@
+diff --git a/OCamlMakefile b/OCamlMakefile
+index b8898ad..2fbcb07 100644
+--- a/OCamlMakefile
++++ b/OCamlMakefile
+@@ -519,8 +519,14 @@ ifndef STATIC
  endif
  
  ifndef LIBINSTALL_FILES
@@ -43,7 +48,7 @@ diff -urNad trunk~/OCamlMakefile trunk/OCamlMakefile
    ifndef STATIC
      ifneq ($(strip $(OBJ_LINK)),)
        LIBINSTALL_FILES += $(DLLSONAME)
-@@ -1138,7 +1144,8 @@
+@@ -1211,7 +1217,8 @@ subprojs: $(SUBPROJS:%=subproj_%)
  .PHONY: libinstall
  libinstall:	all
  	$(QUIET)printf "\nInstalling library with ocamlfind\n"
@@ -52,4 +57,5 @@ diff -urNad trunk~/OCamlMakefile trunk/OCamlMakefile
 +	$(OCAMLFIND) install -destdir $(DESTDIR) -ldconf /dev/null $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES)
  	$(QUIET)printf "\nInstallation successful.\n"
  
- .PHONY: libuninstall
+ .PHONY: libinstall-byte-code
+-- 
diff --git a/debian/patches/0002-build-PIC-shared-objects.patch b/debian/patches/0002-build-PIC-shared-objects.patch
new file mode 100644
index 0000000..6652374
--- /dev/null
+++ b/debian/patches/0002-build-PIC-shared-objects.patch
@@ -0,0 +1,21 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Thu, 8 Apr 2010 22:07:02 +0200
+Subject: [PATCH] build PIC shared objects
+
+---
+ OCamlMakefile |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/OCamlMakefile b/OCamlMakefile
+index 2fbcb07..d1060eb 100644
+--- a/OCamlMakefile
++++ b/OCamlMakefile
+@@ -1113,6 +1113,7 @@ endif
+ 
+ .c.$(EXT_OBJ):
+ 			$(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \
++				-fPIC \
+ 				$(CPPFLAGS) $(CPPFLAGS_WIN32) \
+ 				$(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $<
+ 
+-- 
diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index c2409be..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../upstream
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7d1f296..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-build.dpatch
-fpic.dpatch
diff --git a/debian/patches/fpic.dpatch b/debian/patches/fpic.dpatch
deleted file mode 100755
index 287926f..0000000
--- a/debian/patches/fpic.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fpic.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build shared objects as PIC objects
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./OCamlMakefile /tmp/dpep-work.483SSF/trunk/OCamlMakefile
---- ./OCamlMakefile	2005-06-09 01:42:12.000000000 +0200
-+++ /tmp/dpep-work.483SSF/trunk/OCamlMakefile	2005-07-31 22:00:28.000000000 +0200
-@@ -1011,6 +1011,7 @@
- 
- .c.$(EXT_OBJ):
- 			$(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \
-+				-fPIC \
- 				$(CPPFLAGS) $(CPPFLAGS_WIN32) \
- 				$(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $< 
- 
diff --git a/debian/patches/meta.dpatch b/debian/patches/meta.dpatch
deleted file mode 100755
index 4473e1e..0000000
--- a/debian/patches/meta.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## meta.dpatch by  <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad trunk~/lib/META trunk/lib/META
---- trunk~/lib/META	2004-05-19 10:35:36.000000000 +0000
-+++ trunk/lib/META	2005-11-13 00:07:14.000000000 +0000
-@@ -1,5 +1,5 @@
- name="pcre"
--version="5.08.1"
-+version="5.10.1"
- description="Perl Compatibility Regular Expressions"
- requires=""
- archive(byte)="pcre.cma"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fff5e9e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-enable-byte-only-build.patch
+0002-build-PIC-shared-objects.patch
diff --git a/debian/rules b/debian/rules
index 443f644..eab6e0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
pcre-ocaml packaging

More information about the Pkg-ocaml-maint-commits mailing list