[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9.0-5-7-gb629d39

Tue Aug 2 17:52:44 UTC 2011

The following commit has been merged in the master branch:
commit 9248dbf9f64447deae33695bfaa2d4b1c53a37f3
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Aug 2 19:20:53 2011 +0200

    drop patches that have been incorporated by upstream:
    - drop patch linker_as_needed and drop patch camlimages-4.0.1
    no mor override of dh_strip
    don't make doc

diff --git a/debian/changelog b/debian/changelog
index 1145c63..57e42d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 advi (1.10.0-1) unstable; urgency=low
 
-  * New upstream version.
-
- -- Ralf Treinen <treinen at debian.org>  Tue, 02 Aug 2011 18:18:07 +0200
+  * New upstream version. This version does no longer use -custom for
+    bytecode compilation (closes:  #517546).
+    - drop patch linker_as_needed since now integrated by upstream
+    - drop patch camlimages-4.0.1 since now integrated by upstream
+  * We don't need to override dh_strip anymore since the -custom option
+    is no longer used.
+
+ -- Ralf Treinen <treinen at debian.org>  Tue, 02 Aug 2011 19:11:34 +0200
 
 advi (1.9.0-5) unstable; urgency=low
 
diff --git a/debian/patches/camlimages-4.0.1 b/debian/patches/camlimages-4.0.1
deleted file mode 100644
index d0f18fd..0000000
--- a/debian/patches/camlimages-4.0.1
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Adapt to camlimages 4.0.1
- In camlimages 4.0.1, the library has been splitted in several
- sub-libraries used by advi. Adapt it in consequence.
-Author: Stéphane Glondu <glondu at debian.org>
-
---- advi-1.9.0.orig/configure.ac
-+++ advi-1.9.0/configure.ac
-@@ -33,8 +33,8 @@ else
-   AC_MSG_RESULT([yes])
-   HAVE_CAMLIMAGES="true"
-   CAMLIMAGES_INCLUDES=`$OCAMLFIND query -i-format -separator ' ' -recursive camlimages`
--  CAMLIMAGES_LIBS_NATIVE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates native camlimages`
--  CAMLIMAGES_LIBS_BYTE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates byte camlimages`
-+  CAMLIMAGES_LIBS_NATIVE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates native camlimages.ps camlimages.graphics camlimages.freetype`
-+  CAMLIMAGES_LIBS_BYTE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates byte camlimages.ps camlimages.graphics camlimages.freetype`
-   AC_SUBST(CAMLIMAGES_INCLUDES)
-   AC_SUBST(CAMLIMAGES_LIBS_NATIVE)
-   AC_SUBST(CAMLIMAGES_LIBS_BYTE)
---- advi-1.9.0.orig/configure
-+++ advi-1.9.0/configure
-@@ -3988,8 +3988,8 @@ else
- echo "${ECHO_T}yes" >&6; }
-   HAVE_CAMLIMAGES="true"
-   CAMLIMAGES_INCLUDES=`$OCAMLFIND query -i-format -separator ' ' -recursive camlimages`
--  CAMLIMAGES_LIBS_NATIVE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates native camlimages`
--  CAMLIMAGES_LIBS_BYTE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates byte camlimages`
-+  CAMLIMAGES_LIBS_NATIVE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates native camlimages.ps camlimages.graphics camlimages.freetype`
-+  CAMLIMAGES_LIBS_BYTE=`$OCAMLFIND query -a-format -separator ' ' -recursive -predicates byte camlimages.ps camlimages.graphics camlimages.freetype`
- 
- 
- 
diff --git a/debian/patches/dont-make-doc b/debian/patches/dont-make-doc
new file mode 100644
index 0000000..bdec894
--- /dev/null
+++ b/debian/patches/dont-make-doc
@@ -0,0 +1,13 @@
+Index: advi/Makefile.in
+===================================================================
+--- advi.orig/Makefile.in	2011-08-02 19:07:02.000000000 +0200
++++ advi/Makefile.in	2011-08-02 19:07:16.000000000 +0200
+@@ -224,7 +224,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src tex doc
++SUBDIRS = src tex
+ # SUBDIRS = src 
+ DIST_SUBDIRS = $(SUBDIRS) examples
+ CVSRELEASETAG = Release-$(subst .,_,$(VERSION))
diff --git a/debian/patches/linker_as_needed b/debian/patches/linker_as_needed
deleted file mode 100644
index 33f01bb..0000000
--- a/debian/patches/linker_as_needed
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: enable linking with --as-needed
-Author: Stefan Potyra <sistpoty at ubuntu.com>
-Integrated: Ralf Treinen <treinen at debian.org>
-Debian-bug: 607530:
-
-Index: advi/src/Makefile.am
-===================================================================
---- advi.orig/src/Makefile.am	2011-01-04 03:07:45.000000000 +0100
-+++ advi/src/Makefile.am	2011-02-09 22:03:54.000000000 +0100
-@@ -75,7 +75,7 @@
- COBJS           = $(CSOURCES:.c=.o)
- 
- AM_CFLAGS	= $(XINERAMA_CFLAGS) $(X_CFLAGS)
--AM_LINKFLAGS	= $(XINERAMA_LIBS)
-+LDADD		= $(XINERAMA_LIBS)
- AM_OCAMLCFLAGS	= $(CAMLIMAGES_INCLUDES)
- 
- OTHER_LIBS	= unix str
-@@ -85,12 +85,12 @@
- advi$(EXEEXT): $(COBJS) $(OCAMLOPTOBJS)
- 	$(OCAMLOPT) -o advi$(EXEEXT) \
- 		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) \
--		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS)
-+		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS) $(LDADD)
- 
- advi.byt$(EXEEXT): $(COBJS) $(OCAMLBYTOBJS)
- 	$(OCAMLC) -o advi.byt$(EXEEXT) \
- 		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) -custom \
--		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS)
-+		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS) $(LDADD)
- 
- install_hook: $(INSTALLEXEC) installdata
- 	- texhash
-Index: advi/src/Makefile.in
-===================================================================
---- advi.orig/src/Makefile.in	2011-01-04 03:07:45.000000000 +0100
-+++ advi/src/Makefile.in	2011-02-09 22:03:54.000000000 +0100
-@@ -253,7 +253,7 @@
- OCAMLOPTOBJS = $(OCAMLBUILTSOURCES:.ml=.cmx) $(OCAMLSOURCES:.ml=.cmx)
- COBJS = $(CSOURCES:.c=.o)
- AM_CFLAGS = $(XINERAMA_CFLAGS) $(X_CFLAGS)
--AM_LINKFLAGS = $(XINERAMA_LIBS)
-+LDADD = $(XINERAMA_LIBS)
- AM_OCAMLCFLAGS = $(CAMLIMAGES_INCLUDES)
- OTHER_LIBS = unix str
- OCAMLLIBS_OPT = $(CAMLIMAGES_LIBS_NATIVE) $(OTHER_LIBS:=.cmxa)
-@@ -519,12 +519,12 @@
- advi$(EXEEXT): $(COBJS) $(OCAMLOPTOBJS)
- 	$(OCAMLOPT) -o advi$(EXEEXT) \
- 		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) \
--		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS)
-+		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS) $(LDADD)
- 
- advi.byt$(EXEEXT): $(COBJS) $(OCAMLBYTOBJS)
- 	$(OCAMLC) -o advi.byt$(EXEEXT) \
- 		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) -custom \
--		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS)
-+		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS) $(LDADD)
- 
- install_hook: $(INSTALLEXEC) installdata
- 	- texhash
diff --git a/debian/patches/series b/debian/patches/series
index 466fcee..92df814 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,7 @@
+dont-make-doc
 no-local-advirc
 typo-message
 manpage
 examples-distclean
-linker_as_needed
 examples-makefiles
 examples-scripts
-camlimages-4.0.1
diff --git a/debian/rules b/debian/rules
index 1147635..f00bb92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,6 @@ OPT                 = $(shell test -x /usr/bin/ocamlopt && echo true)
 	dh $@ --with tex,ocaml
 
 override_dh_auto_configure:
-# The following line is a horrible hack to prevent triggering recompilation
-# of documentation (there are missing tools on Debian), as consequence of
-# patching configure
-	touch -rdoc/index.htm configure
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 			--build=$(DEB_BUILD_GNU_TYPE) \
 			--prefix=/usr \
@@ -29,14 +25,6 @@ else
 	cd $(CURDIR)/debian/advi/usr/bin && mv -f advi.byt advi
 endif
 
-# Do not strip the executable when compiling to bytecode (bug #500286).
-# This should be dropped as soon as bytecode compilation can be done without
-# using the -custom option (see bug #517546).
-ifeq ($(OPT),false)
-override_dh_strip:
-	dh_strip
-endif
-
 override_dh_compress:
 	dh_compress --exclude=usr/share/doc/advi/splash.dvi
 

-- 
advi packaging

