[Pkg-ocaml-maint-commits] [SCM] liquidsoap packaging branch, master, updated. debian/0.9.3-1-10-gdb700c1
Stephane Glondu
steph at glondu.net
Sun Feb 27 10:34:26 UTC 2011
The following commit has been merged in the master branch:
commit ffda350a2336d948ff38fa9492a5f4d0083bedef
Author: Stephane Glondu <steph at glondu.net>
Date: Sun Feb 27 10:56:36 2011 +0100
Properly switch source package format to 3.0 (quilt)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/control b/debian/control
index 012fcfa..b2ed6c9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends: cdbs (>= 0.4.53),
debhelper (>= 7.0.1),
ocaml-nox,
dh-ocaml (>= 0.9),
- quilt,
patchutils (>= 0.2.25),
ocaml-findlib, libcry-ocaml-dev (>= 0.1.5),
libogg-ocaml-dev (>= 0.4.1), libvorbis-ocaml-dev (>= 0.5.1-2),
diff --git a/debian/patches/enable_no_custom.patch b/debian/patches/0001-Enabled-non-custom-build-for-bytecode-compilation.patch
similarity index 78%
rename from debian/patches/enable_no_custom.patch
rename to debian/patches/0001-Enabled-non-custom-build-for-bytecode-compilation.patch
index be13bf3..193aca8 100644
--- a/debian/patches/enable_no_custom.patch
+++ b/debian/patches/0001-Enabled-non-custom-build-for-bytecode-compilation.patch
@@ -1,8 +1,62 @@
-Index: liquidsoap/src/Makefile
-===================================================================
---- liquidsoap.orig/src/Makefile 2010-09-28 14:25:57.000000000 -0500
-+++ liquidsoap/src/Makefile 2010-09-28 14:26:58.000000000 -0500
-@@ -8,6 +8,13 @@
+From: Romain Beauxis <toots at rastageeks.org>
+Date: Tue, 28 Sep 2010 14:44:28 -0500
+Subject: [PATCH] Enabled non-custom build for bytecode compilation.
+
+---
+ Makefile.rules | 23 +++++++++++++++++++++--
+ src/Makefile | 26 +++++++++++---------------
+ 2 files changed, 32 insertions(+), 17 deletions(-)
+
+diff --git a/Makefile.rules b/Makefile.rules
+index d75494a..8a29a0b 100644
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -78,12 +78,27 @@ $(PROG)_depend: $($(PROG)_sources) $($(PROG)_headers)
+ $(V)$(OCAMLDEP) $(_DEP_OPTS) $(DEP_OPTS) \
+ $($(PROG)_sources) $($(PROG)_headers) > $@
+
+-$(PROG): $($(PROG)_sources:.ml=.$(o))
++dll$(PROG).so: $($(PROG)_c_files:.c=.o)
++ $(V)echo OCAMLMKLIB -o dll$(PROG).so
++ $(V)ocamlmklib -o $(PROG) $($(PROG)_c_files:.c=.o)
++
++ifdef $(PROG)_c_files
++ ifeq ($(BYTE),yes)
++ c_objs=dll$(PROG).so $($(PROG)_c_files:.c=.o)
++ c_link=-dllib dll$(PROG).so $($(PROG)_c_files:.c=.o)
++ else
++ c_objs=$($(PROG)_c_files:.c=.o)
++ c_link=$(c_objs)
++ endif
++endif
++
++$(PROG): $($(PROG)_sources:.ml=.$(o)) $(c_objs)
+ $(V)echo OCAMLC -o $(PROG)
+ $(V)$(OCAMLC) -o $(PROG) \
+ $(_OCAML_CFLAGS) $(OCAML_CFLAGS) \
+ $(_OCAML_LFLAGS) $(OCAML_LFLAGS) \
+- $($(PROG)_sources:.ml=.$(o)) $($(PROG)_objs)
++ $($(PROG)_sources:.ml=.$(o)) \
++ $(c_link)
+ endif
+
+ %.ml: %.mll
+@@ -102,6 +117,10 @@ endif
+ $(V)echo OCAMLC -c $<
+ $(V)$(OCAMLC) $(_OCAML_CFLAGS) $(OCAML_CFLAGS) -c $<
+
++%.o: %.c
++ $(V)echo CC -c $<
++ $(V)$(CC) $(CFLAGS) -c $< -o $@
++
+ #
+ # dist
+ #
+diff --git a/src/Makefile b/src/Makefile
+index 8c3f852..19b84d3 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -8,6 +8,13 @@ DISTFILES = $(wildcard *.mli) Makefile \
ocaml_progs= liquidsoap
@@ -16,7 +70,7 @@ Index: liquidsoap/src/Makefile
ogg_utils = \
$(if $(W_OGG),ogg_demuxer.ml) \
$(if $(W_OGG),ogg_encoder.ml) \
-@@ -114,27 +121,25 @@
+@@ -114,27 +121,25 @@ outputs = outputs/output.ml outputs/file_output.ml \
$(if $(W_SDL),outputs/sdl_out.ml) \
$(if $(W_GRAPHICS),outputs/graphics_out.ml)
@@ -48,7 +102,7 @@ Index: liquidsoap/src/Makefile
stream/aFrame.ml stream/vFrame.ml stream/mFrame.ml
visualization = visualization/vumeter.ml \
-@@ -191,15 +196,6 @@
+@@ -191,15 +196,6 @@ liquidsoap_doc_sources= \
top_srcdir=..
include $(top_srcdir)/Makefile.rules
@@ -64,48 +118,4 @@ Index: liquidsoap/src/Makefile
# Compute something like " (trunk/liquidsoap at rev1234)" when .svn is present,
SVN.ml: Makefile $(liquidsoap_sources:SVN.ml=)
if test -d .svn && which svn > /dev/null ; then \
-Index: liquidsoap/Makefile.rules
-===================================================================
---- liquidsoap.orig/Makefile.rules 2010-09-28 14:25:57.000000000 -0500
-+++ liquidsoap/Makefile.rules 2010-09-28 14:27:16.000000000 -0500
-@@ -78,12 +78,27 @@
- $(V)$(OCAMLDEP) $(_DEP_OPTS) $(DEP_OPTS) \
- $($(PROG)_sources) $($(PROG)_headers) > $@
-
--$(PROG): $($(PROG)_sources:.ml=.$(o))
-+dll$(PROG).so: $($(PROG)_c_files:.c=.o)
-+ $(V)echo OCAMLMKLIB -o dll$(PROG).so
-+ $(V)ocamlmklib -o $(PROG) $($(PROG)_c_files:.c=.o)
-+
-+ifdef $(PROG)_c_files
-+ ifeq ($(BYTE),yes)
-+ c_objs=dll$(PROG).so $($(PROG)_c_files:.c=.o)
-+ c_link=-dllib dll$(PROG).so $($(PROG)_c_files:.c=.o)
-+ else
-+ c_objs=$($(PROG)_c_files:.c=.o)
-+ c_link=$(c_objs)
-+ endif
-+endif
-+
-+$(PROG): $($(PROG)_sources:.ml=.$(o)) $(c_objs)
- $(V)echo OCAMLC -o $(PROG)
- $(V)$(OCAMLC) -o $(PROG) \
- $(_OCAML_CFLAGS) $(OCAML_CFLAGS) \
- $(_OCAML_LFLAGS) $(OCAML_LFLAGS) \
-- $($(PROG)_sources:.ml=.$(o)) $($(PROG)_objs)
-+ $($(PROG)_sources:.ml=.$(o)) \
-+ $(c_link)
- endif
-
- %.ml: %.mll
-@@ -102,6 +117,10 @@
- $(V)echo OCAMLC -c $<
- $(V)$(OCAMLC) $(_OCAML_CFLAGS) $(OCAML_CFLAGS) -c $<
-
-+%.o: %.c
-+ $(V)echo CC -c $<
-+ $(V)$(CC) $(CFLAGS) -c $< -o $@
-+
- #
- # dist
- #
+--
diff --git a/debian/patches/series b/debian/patches/series
index 5aa4cb1..559321f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-enable_no_custom.patch
+0001-Enabled-non-custom-build-for-bytecode-compilation.patch
diff --git a/debian/rules b/debian/rules
index 575696f..00b1f6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/ocaml.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# In order to regenerate 'debian/control' :
# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches
--
liquidsoap packaging
More information about the Pkg-ocaml-maint-commits
mailing list