[Pkg-ocaml-maint-commits] [SCM] sexplib310 packaging branch, master, updated. debian/4.2.11-2-1-gc1ade3b

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit c1ade3b12b04821b156057c3f8700274ea8bb33a
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Nov 9 13:45:50 2009 +0100

    switch from topgit-style patches to quilt-style patches
    
    handled by dom-{apply,save}-patches

diff --git a/debian/changelog b/debian/changelog
index ff1b33e..6c49706 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sexplib310 (4.2.11-3) UNRELEASED; urgency=low
+
+  * Get rid of topgit, packaging now uses plain old quilt
+
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 09 Nov 2009 13:48:49 +0100
+
 sexplib310 (4.2.11-2) unstable; urgency=low
 
   * Generate ocamldoc documentation
diff --git a/debian/patches/debian/byte-build.diff b/debian/patches/0001-add-Makefile-targets-to-build-install-bytecode-objec.patch
similarity index 79%
rename from debian/patches/debian/byte-build.diff
rename to debian/patches/0001-add-Makefile-targets-to-build-install-bytecode-objec.patch
index 549720d..5c06291 100644
--- a/debian/patches/debian/byte-build.diff
+++ b/debian/patches/0001-add-Makefile-targets-to-build-install-bytecode-objec.patch
@@ -1,9 +1,6 @@
 From: Stefano Zacchiroli <zack at upsilon.cc>
-Subject: [PATCH] debian/byte-build
-
-add Makefile targets to build/install bytecode objects only
-
-Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Mon, 9 Nov 2009 13:42:53 +0100
+Subject: [PATCH] add Makefile targets to build/install bytecode objects only
 
 ---
  Makefile      |    9 +++++++++
@@ -12,12 +9,12 @@ Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
  3 files changed, 15 insertions(+), 1 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 4c67b1a..3d0ecd8 100644
+index 1e10a55..fa74069 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -3,10 +3,19 @@ all:
  	@cd lib && $(MAKE)
- 	@cd lib_test && make
+ 	@cd lib_test && $(MAKE)
  
 +.PHONY: byte
 +byte:
@@ -36,10 +33,10 @@ index 4c67b1a..3d0ecd8 100644
  uninstall:
  	@cd lib && $(MAKE) $@
 diff --git a/OCamlMakefile b/OCamlMakefile
-index e9e0753..a21696b 100644
+index e9deb24..86ba1a9 100644
 --- a/OCamlMakefile
 +++ b/OCamlMakefile
-@@ -1182,7 +1182,7 @@ libinstall:	all
+@@ -1216,7 +1216,7 @@ libinstall:	all
  	$(QUIET)printf "\nInstallation successful.\n"
  
  .PHONY: libinstall-byte-code
@@ -49,7 +46,7 @@ index e9e0753..a21696b 100644
  	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
  	  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
 diff --git a/lib/Makefile b/lib/Makefile
-index 40037a3..8fc4296 100644
+index bc19bc3..f466b05 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
 @@ -25,6 +25,11 @@ all: \
@@ -65,4 +62,3 @@ index 40037a3..8fc4296 100644
  			install_printers.cmi install_printers.cmo
  	$(OCAMLC) -a -o sexplib_top.cma sexplib.cma install_printers.cmo
 -- 
-tg: (9cbfeee..) debian/byte-build (depends on: upstream)
diff --git a/debian/patches/fixes/missing-meta-deps.diff b/debian/patches/0002-add-missing-META-dependencies.patch
similarity index 63%
rename from debian/patches/fixes/missing-meta-deps.diff
rename to debian/patches/0002-add-missing-META-dependencies.patch
index c0fbbf4..01807a6 100644
--- a/debian/patches/fixes/missing-meta-deps.diff
+++ b/debian/patches/0002-add-missing-META-dependencies.patch
@@ -1,16 +1,13 @@
 From: Stefano Zacchiroli <zack at upsilon.cc>
-Subject: [PATCH] fixes/missing-meta-deps
-
-add missing META dependencies
-
-Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Mon, 9 Nov 2009 13:43:42 +0100
+Subject: [PATCH] add missing META dependencies
 
 ---
  lib/Makefile |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/lib/Makefile b/lib/Makefile
-index 40037a3..416eabd 100644
+index f466b05..a851f89 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
 @@ -12,7 +12,7 @@ SOURCES = \
@@ -23,4 +20,3 @@ index 40037a3..416eabd 100644
  
  TRASH = \
 -- 
-tg: (9cbfeee..) fixes/missing-meta-deps (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index f698062..39b34fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-debian/byte-build.diff -p1
-fixes/missing-meta-deps.diff -p1
+0001-add-Makefile-targets-to-build-install-bytecode-objec.patch
+0002-add-missing-META-dependencies.patch

-- 
sexplib310 packaging