[Pkg-ocaml-maint-commits] r1789 - in trunk/packages/omake/trunk: . debian debian/patches

Mike Furr mfurr at costa.debian.org
Thu Sep 22 04:24:21 UTC 2005 

Author: mfurr
Date: 2005-09-22 04:24:20 +0000 (Thu, 22 Sep 2005)
New Revision: 1789

Removed:
   trunk/packages/omake/trunk/debian/patches/01_Makefile_in.dpatch
   trunk/packages/omake/trunk/omake_0.9.6.orig.tar.gz
Modified:
   trunk/packages/omake/trunk/debian/changelog
   trunk/packages/omake/trunk/debian/patches/00list
   trunk/packages/omake/trunk/debian/rules
Log:
new upstream release

Modified: trunk/packages/omake/trunk/debian/changelog
===================================================================
--- trunk/packages/omake/trunk/debian/changelog	2005-09-21 16:55:20 UTC (rev 1788)
+++ trunk/packages/omake/trunk/debian/changelog	2005-09-22 04:24:20 UTC (rev 1789)
@@ -1,3 +1,22 @@
+omake (0.9.6.5-2-1) unstable; urgency=low
+
+  * New upstream release. 
+
+ -- Mike Furr <mfurr at debian.org>  Wed, 21 Sep 2005 18:22:45 -0400
+
+omake (0.9.6-3) unstable; urgency=low
+
+  * Argh, fix the final omake target in the makefile for non-opt
+    architectures.
+
+ -- Mike Furr <mfurr at debian.org>  Thu,  4 Aug 2005 00:53:38 -0400
+
+omake (0.9.6-2) unstable; urgency=low
+
+  * Patch Makefile to handle archs with only bytecode compilers 
+
+ -- Mike Furr <mfurr at debian.org>  Wed,  3 Aug 2005 22:55:06 -0400
+
 omake (0.9.6-1) unstable; urgency=low
 
   * New upstream release 

Modified: trunk/packages/omake/trunk/debian/patches/00list
===================================================================
--- trunk/packages/omake/trunk/debian/patches/00list	2005-09-21 16:55:20 UTC (rev 1788)
+++ trunk/packages/omake/trunk/debian/patches/00list	2005-09-22 04:24:20 UTC (rev 1789)
@@ -1 +0,0 @@
-01_Makefile_in

Deleted: trunk/packages/omake/trunk/debian/patches/01_Makefile_in.dpatch
===================================================================
--- trunk/packages/omake/trunk/debian/patches/01_Makefile_in.dpatch	2005-09-21 16:55:20 UTC (rev 1788)
+++ trunk/packages/omake/trunk/debian/patches/01_Makefile_in.dpatch	2005-09-22 04:24:20 UTC (rev 1789)
@@ -1,75 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_Makefile_in.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 --exclude=CVS --exclude=.svn ./Makefile.in /tmp/dpep-work.Z1XiZY/omake-0.9.6/Makefile.in
---- ./Makefile.in	2005-07-27 11:13:49.812795654 -0400
-+++ /tmp/dpep-work.Z1XiZY/omake-0.9.6/Makefile.in	2005-07-27 11:14:08.739304759 -0400
-@@ -4,9 +4,9 @@
- ifndef exec_prefix
-     exec_prefix = @exec_prefix@
- endif
--libdir = @libdir@
--bindir = @bindir@
--mandir = @mandir@
-+libdir = $(DESTDIR)/@libdir@
-+bindir = $(DESTDIR)/@bindir@
-+mandir = $(DESTDIR)/@mandir@
- 
- CP = /bin/cp
- LN = @LN_S@
-@@ -41,7 +41,11 @@
- include Files
- 
- CMALIBS  = unix.cma
-+ifeq ($(OCAMLC),$(OCAMLOPT))
-+CMXALIBS = $(CMALIBS)
-+else
- CMXALIBS = unix.cmxa
-+endif
- 
- #
- # Everything
-@@ -61,7 +65,7 @@
- .PHONY: all
- .SUFFIXES: .mly .input
- 
--all: $(OMAKE) $(CVSRC) OMakefile.default OMakeroot.default $(INSTALLFILES) call-omake
-+all: $(OMAKE) OMakefile.default OMakeroot.default $(INSTALLFILES) call-omake
- 
- #
- # Main program
-@@ -151,18 +155,18 @@
- 	-$(INSTALL) -d $(mandir)/man1
- 	-$(INSTALL) -d $(libdir)/omake
- 	-$(INSTALL) -d $(libdir)/omake/build
--	$(INSTALL) -m 555 $(OMAKE) $(bindir)/$(OMAKE)
--	$(INSTALL) -m 555 $(OMAKE) $(bindir)/$(OSH)
--	$(INSTALL) -m 555 $(CVSRC) $(bindir)/$(CVSRC)
--	$(INSTALL) -m 444 doc/man/*.1 $(mandir)/man1/
--	$(INSTALL) -m 444 OMakeroot.default $(libdir)/omake/OMakeroot.default
--	$(INSTALL) -m 444 OMakefile.default $(libdir)/omake/OMakefile.default
--	$(INSTALL) -m 444 OMakeroot.install $(libdir)/omake/OMakeroot
--	$(INSTALL) -m 444 Pervasives.install $(libdir)/omake/Pervasives
--	$(INSTALL) -m 444 Common.install $(libdir)/omake/build/Common
--	$(INSTALL) -m 444 C.install      $(libdir)/omake/build/C
--	$(INSTALL) -m 444 OCaml.install  $(libdir)/omake/build/OCaml
--	$(INSTALL) -m 444 LaTeX.install  $(libdir)/omake/build/LaTeX
-+	$(INSTALL) -m 755 $(OMAKE) $(bindir)/$(OMAKE)
-+	$(INSTALL) -m 755 $(OMAKE) $(bindir)/$(OSH)
-+#	$(INSTALL) -m 755 $(CVSRC) $(bindir)/$(CVSRC)
-+	$(INSTALL) -m 644 doc/man/*.1 $(mandir)/man1/
-+	$(INSTALL) -m 644 OMakeroot.default $(libdir)/omake/OMakeroot.default
-+	$(INSTALL) -m 644 OMakefile.default $(libdir)/omake/OMakefile.default
-+	$(INSTALL) -m 644 OMakeroot.install $(libdir)/omake/OMakeroot
-+	$(INSTALL) -m 644 Pervasives.install $(libdir)/omake/Pervasives
-+	$(INSTALL) -m 644 Common.install $(libdir)/omake/build/Common
-+	$(INSTALL) -m 644 C.install      $(libdir)/omake/build/C
-+	$(INSTALL) -m 644 OCaml.install  $(libdir)/omake/build/OCaml
-+	$(INSTALL) -m 644 LaTeX.install  $(libdir)/omake/build/LaTeX
- 
- #
- # Don't use threads

Modified: trunk/packages/omake/trunk/debian/rules
===================================================================
--- trunk/packages/omake/trunk/debian/rules	2005-09-21 16:55:20 UTC (rev 1788)
+++ trunk/packages/omake/trunk/debian/rules	2005-09-22 04:24:20 UTC (rev 1789)
@@ -10,34 +10,15 @@
 #export DH_VERBOSE=1
 
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 PACKAGE=omake
 include /usr/share/dpatch/dpatch.make
 
-config.status: patch-stamp configure
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-
 build: build-stamp
-
-build-stamp:  config.status
+build-stamp: 
 	dh_testdir
 
-	$(MAKE)
+	$(MAKE) PREFIX=/usr MANDIR=/usr/share/man boot
+	$(MAKE) PREFIX=/usr MANDIR=/usr/share/man all
 
 	touch build-stamp
 
@@ -47,15 +28,8 @@
 	dh_testroot
 	rm -f build-stamp 
 
-	-$(MAKE) clean
+	-./omake-boot clean
 
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
 	dh_clean 
 
 install: build
@@ -64,9 +38,11 @@
 	dh_clean -k 
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/omake/
+	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/omake/ install
 
+	rm -f $(CURDIR)/debian/omake/usr/bin/cvs_realclean
 
+
 binary-indep: build install
 
 
@@ -82,7 +58,7 @@
 	rm debian/omake/usr/share/doc/omake/html/images/*.tex
 	dh_installexamples
 	dh_install
-	dh_installman doc/man/*.1
+#	dh_installman doc/man/*.1
 	dh_strip
 	dh_compress -Xhtml/
 	dh_fixperms

Deleted: trunk/packages/omake/trunk/omake_0.9.6.orig.tar.gz
===================================================================
(Binary files differ)

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