[Pkg-ocaml-maint-commits] r1943 - in trunk/packages/otags: . debian debian/patches

Mike Furr mfurr at costa.debian.org
Wed Nov 9 03:24:35 UTC 2005 

Author: mfurr
Date: 2005-11-09 03:24:34 +0000 (Wed, 09 Nov 2005)
New Revision: 1943

Added:
   trunk/packages/otags/debian/patches/10_Makefile.dpatch
   trunk/packages/otags/otags_3.09.0.orig.tar.gz
Removed:
   trunk/packages/otags/debian/patches/10_bytecode.dpatch
   trunk/packages/otags/otags_3.08.0.2.orig.tar.gz
Modified:
   trunk/packages/otags/debian/changelog
   trunk/packages/otags/debian/control
   trunk/packages/otags/debian/dirs
   trunk/packages/otags/debian/docs
   trunk/packages/otags/debian/patches/00list
   trunk/packages/otags/debian/rules
Log:
3.09 release


Modified: trunk/packages/otags/debian/changelog
===================================================================
--- trunk/packages/otags/debian/changelog	2005-11-08 22:16:59 UTC (rev 1942)
+++ trunk/packages/otags/debian/changelog	2005-11-09 03:24:34 UTC (rev 1943)
@@ -1,3 +1,9 @@
+otags (3.09.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Mike Furr <mfurr at debian.org>  Tue,  8 Nov 2005 20:24:27 -0500
+
 otags (3.08.0.2-3) unstable; urgency=medium
 
   * Rebuild against 3.08.3 (and updated deps) 

Modified: trunk/packages/otags/debian/control
===================================================================
--- trunk/packages/otags/debian/control	2005-11-08 22:16:59 UTC (rev 1942)
+++ trunk/packages/otags/debian/control	2005-11-09 03:24:34 UTC (rev 1943)
@@ -2,12 +2,12 @@
 Section: devel
 Priority: optional
 Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: ocaml-nox-3.08.3, debhelper (>= 4.0.0), dpatch
+Build-Depends: ocaml-nox-3.09.0, debhelper (>= 4.0.0), dpatch
 Standards-Version: 3.6.1.0
 
 Package: otags
 Architecture: any
-Depends: ocaml-nox-3.08.3,${shlibs:Depends}
+Depends: ocaml-nox-3.09.0,${shlibs:Depends}
 Description: tool for building TAGS files from O'Caml sources
  otags is a tool for building "TAGS" files for emacs and vi.  TAGS
  files provide the editor with an index table, mapping important

Modified: trunk/packages/otags/debian/dirs
===================================================================
--- trunk/packages/otags/debian/dirs	2005-11-08 22:16:59 UTC (rev 1942)
+++ trunk/packages/otags/debian/dirs	2005-11-09 03:24:34 UTC (rev 1943)
@@ -1,2 +1,2 @@
 usr/bin
-usr/lib/ocaml/3.08.3/otags
+usr/lib/ocaml/3.09.0/otags

Modified: trunk/packages/otags/debian/docs
===================================================================
--- trunk/packages/otags/debian/docs	2005-11-08 22:16:59 UTC (rev 1942)
+++ trunk/packages/otags/debian/docs	2005-11-09 03:24:34 UTC (rev 1943)
@@ -1,4 +1 @@
 README
-HISTORY
-THANKS
-AUTHORS

Modified: trunk/packages/otags/debian/patches/00list
===================================================================
--- trunk/packages/otags/debian/patches/00list	2005-11-08 22:16:59 UTC (rev 1942)
+++ trunk/packages/otags/debian/patches/00list	2005-11-09 03:24:34 UTC (rev 1943)
@@ -1,2 +1 @@
-10_bytecode
-
+10_Makefile

Added: trunk/packages/otags/debian/patches/10_Makefile.dpatch
===================================================================
--- trunk/packages/otags/debian/patches/10_Makefile.dpatch	2005-11-08 22:16:59 UTC (rev 1942)
+++ trunk/packages/otags/debian/patches/10_Makefile.dpatch	2005-11-09 03:24:34 UTC (rev 1943)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_Makefile.dpatch by Mike Furr <mfurr at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad otags-3.09.0~/Makefile otags-3.09.0/Makefile
+--- otags-3.09.0~/Makefile	2005-11-04 10:08:28.000000000 -0500
++++ otags-3.09.0/Makefile	2005-11-08 22:15:01.864862679 -0500
+@@ -124,11 +124,11 @@
+ 	rm -f *.tar*
+ 
+ install: $(LIBS) $(OBJ)
+-	mkdir -p $(BINDIR) $(INSTALLLIBDIR)
+-	install -m 644 $(LIBS) $(INSTALLLIBDIR)
+-	install -m 755 $(OBJ) $(BINDIR)
++	mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(INSTALLLIBDIR)
++	install -m 644 $(LIBS) $(DESTDIR)$(INSTALLLIBDIR)
++	install -m 755 $(OBJ) $(DESTDIR)$(BINDIR)
+ 	if [ $(NATIVE) = "true" ] ; then \
+-		install -m 755 $(NCAMLP4) $(BINDIR); \
++		install -m 755 $(NCAMLP4) $(DESTDIR)$(BINDIR); \
+ 	fi
+ 
+ uninstall:


Property changes on: trunk/packages/otags/debian/patches/10_Makefile.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: trunk/packages/otags/debian/patches/10_bytecode.dpatch
===================================================================
--- trunk/packages/otags/debian/patches/10_bytecode.dpatch	2005-11-08 22:16:59 UTC (rev 1942)
+++ trunk/packages/otags/debian/patches/10_bytecode.dpatch	2005-11-09 03:24:34 UTC (rev 1943)
@@ -1,118 +0,0 @@
-#! /bin/sh -e
-## 10_bytecode.dpatch by Mike Furr <mfurr at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /home/furrm/debian/pkg-ocaml-maint/packages/otags/otags-3.08.0.2/Makefile otags-3.08.0.2/Makefile
---- /home/furrm/debian/pkg-ocaml-maint/packages/otags/otags-3.08.0.2/Makefile	2004-07-29 13:14:27.000000000 -0400
-+++ otags-3.08.0.2/Makefile	2004-07-29 13:14:28.000000000 -0400
-@@ -65,14 +65,14 @@
- pr_vi_tags.cmxa: ${VI_ML:%.ml=%.cmx}
- 	ocamlopt -a -o $@ ${ZLIBS} $+
- 
--otags: conf.cmx otags.cmx
--	$(CAMLLD) unix.cmxa -o $@ $+ -cclib -lunix
-+otags: conf.$(OCAMLEXT) otags.$(OCAMLEXT)
-+	$(CAMLLD) unix.$(OCAMLEXTAR) -o $@ $+ -cclib -lunix
- 
--camlp4o_pr_emacs: tags.cmxa pr_emacs_tags.cmxa
--	${CAMLLD} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp4.cmxa pa_o.cmx $+
-+camlp4o_pr_emacs: tags.$(OCAMLEXTAR) pr_emacs_tags.$(OCAMLEXTAR)
-+	${CAMLLD} -linkall -o $@ -I ${CAMLP4DIR} odyl.$(OCAMLEXTAR) camlp4.$(OCAMLEXTAR) pa_o.$(OCAMLEXT) $+
- 
--camlp4o_pr_vi: tags.cmxa pr_vi_tags.cmxa 
--	${CAMLLD} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp4.cmxa pa_o.cmx $+
-+camlp4o_pr_vi: tags.$(OCAMLEXTAR) pr_vi_tags.$(OCAMLEXTAR) 
-+	${CAMLLD} -linkall -o $@ -I ${CAMLP4DIR} odyl.$(OCAMLEXTAR) camlp4.$(OCAMLEXTAR) pa_o.$(OCAMLEXT) $+
- 
- clean::
- 	rm -f *~
-@@ -89,9 +89,9 @@
- 	rm Makefile.here conf.ml
- 
- install: $(LIBS) $(OBJ)
--	mkdir -p $(BINDIR) $(INSTALLLIBDIR)
--	install -m 644 $(LIBS) $(INSTALLLIBDIR)
--	install -m 755 $(OBJ) $(BINDIR)
-+	mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(INSTALLLIBDIR)
-+	install -m 644 $(LIBS) $(DESTDIR)$(INSTALLLIBDIR)
-+	install -m 755 $(OBJ) $(DESTDIR)$(BINDIR)
- 
- uninstall:
- 	(cd $(INSTALLLIBDIR); rm -f $(LIBS))
-diff -urNad /home/furrm/debian/pkg-ocaml-maint/packages/otags/otags-3.08.0.2/Makefile.config otags-3.08.0.2/Makefile.config
---- /home/furrm/debian/pkg-ocaml-maint/packages/otags/otags-3.08.0.2/Makefile.config	2004-07-29 13:14:27.000000000 -0400
-+++ otags-3.08.0.2/Makefile.config	2004-07-29 13:14:28.000000000 -0400
-@@ -12,7 +12,7 @@
- CAMLLEX=ocamllex
- CAMLDEP=ocamldep
- CAMLAR=ocamlc -a
--CAMLLD=ocamlopt
-+#CAMLLD=ocamlopt
- 
- # Additional compilation flags
- ZFLAGS=${shell grep "(\*!" $< | cut -d! -f2}
-diff -urNad /home/furrm/debian/pkg-ocaml-maint/packages/otags/otags-3.08.0.2/Makefile.here.tpl otags-3.08.0.2/Makefile.here.tpl
---- /home/furrm/debian/pkg-ocaml-maint/packages/otags/otags-3.08.0.2/Makefile.here.tpl	2004-07-29 13:14:27.000000000 -0400
-+++ otags-3.08.0.2/Makefile.here.tpl	2004-07-29 13:14:28.000000000 -0400
-@@ -14,3 +14,8 @@
- 
- # ocaml source location
- CAMLSRC=tplocamlsrc
-+
-+# bytecode or nativecode
-+OCAMLEXT=tplocamlext
-+OCAMLEXTAR=tplocamlar
-+CAMLLD=tplcamlld
-diff -urNad /home/furrm/debian/pkg-ocaml-maint/packages/otags/otags-3.08.0.2/configure otags-3.08.0.2/configure
---- /home/furrm/debian/pkg-ocaml-maint/packages/otags/otags-3.08.0.2/configure	2004-07-29 13:14:27.000000000 -0400
-+++ otags-3.08.0.2/configure	2004-07-29 13:14:28.000000000 -0400
-@@ -85,6 +85,19 @@
- #        exit
- #  fi
- 
-+echo -n Checking for ocamlopt...
-+if [ `which ocamlopt` ]; then
-+    echo `which ocamlopt`
-+    ocamlext=cmx
-+    ocamlar=cmxa
-+    camlld=ocamlopt
-+else
-+    echo no
-+    ocamlext=cmo
-+    ocamlar=cma
-+    camlld=ocamlc
-+fi
-+
- ./mk_conf $libdir $bindir $ocamlsrc_spec > conf.ml
- 
- # Summary of the configuration
-@@ -104,5 +117,8 @@
-     -e "s|tplocamlspec|$ocamlsrc_spec|" \
-     -e "s|tplocamlsrc|$ocamlsrc|" \
-     -e "s|tplncamlgoals|$ncamlgoals|" \
-+    -e "s|tplocamlext|$ocamlext|" \
-+    -e "s|tplocamlar|$ocamlar|" \
-+    -e "s|tplcamlld|$camlld|" \
-     Makefile.here.tpl > Makefile.here
- #    -e "s|tplsplay|$splaydir|" \

Modified: trunk/packages/otags/debian/rules
===================================================================
--- trunk/packages/otags/debian/rules	2005-11-08 22:16:59 UTC (rev 1942)
+++ trunk/packages/otags/debian/rules	2005-11-09 03:24:34 UTC (rev 1943)
@@ -11,7 +11,7 @@
 
 configure-stamp: patch-stamp configure
 	dh_testdir
-	./configure --prefix /usr --libdir /usr/lib/ocaml/3.08.3/otags/
+	./configure --prefix /usr --libdir /usr/lib/ocaml/3.09.0/otags/
 	touch configure-stamp
 
 build: build-stamp

Deleted: trunk/packages/otags/otags_3.08.0.2.orig.tar.gz
===================================================================
(Binary files differ)

Added: trunk/packages/otags/otags_3.09.0.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/packages/otags/otags_3.09.0.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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