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

Mike Furr mfurr at costa.debian.org
Fri Jul 29 17:31:45 UTC 2005 

Author: mfurr
Date: 2005-07-29 17:30:56 +0000 (Fri, 29 Jul 2005)
New Revision: 1509

Added:
   trunk/packages/omake/trunk/omake_0.9.6.orig.tar.gz
Removed:
   trunk/packages/omake/trunk/debian/files
   trunk/packages/omake/trunk/omake_0.9.4.orig.tar.gz
Modified:
   trunk/packages/omake/trunk/debian/changelog
   trunk/packages/omake/trunk/debian/control
   trunk/packages/omake/trunk/debian/docs
   trunk/packages/omake/trunk/debian/patches/01_Makefile_in.dpatch
   trunk/packages/omake/trunk/debian/rules
Log:
new upstream release


Modified: trunk/packages/omake/trunk/debian/changelog
===================================================================
--- trunk/packages/omake/trunk/debian/changelog	2005-07-29 10:55:48 UTC (rev 1508)
+++ trunk/packages/omake/trunk/debian/changelog	2005-07-29 17:30:56 UTC (rev 1509)
@@ -1,3 +1,9 @@
+omake (0.9.6-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Mike Furr <mfurr at debian.org>  Fri, 22 Jul 2005 16:18:23 -0400
+
 omake (0.9.4-1) unstable; urgency=low
 
   * Initial release Closes: #316561

Modified: trunk/packages/omake/trunk/debian/control
===================================================================
--- trunk/packages/omake/trunk/debian/control	2005-07-29 10:55:48 UTC (rev 1508)
+++ trunk/packages/omake/trunk/debian/control	2005-07-29 17:30:56 UTC (rev 1509)
@@ -2,12 +2,12 @@
 Section: devel
 Priority: optional
 Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, ocaml-nox-3.08.3, libfam-dev, libreadline5-dev, libncurses5-dev, dpatch
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, ocaml-nox-3.08.3, libfam-dev (>= 2.7.0-7.2), libreadline5-dev, libncurses5-dev, dpatch
 Standards-Version: 3.6.2
 
 Package: omake
 Architecture: any
-Depends: ocaml-nox-3.08.3,${shlibs:Depends}
+Depends: ${shlibs:Depends}
 Description: build system with automated dependency analysis
  omake is a build system designed to scale from small projects to very
  large projects spanning many directories. omake uses a syntax similar

Modified: trunk/packages/omake/trunk/debian/docs
===================================================================
--- trunk/packages/omake/trunk/debian/docs	2005-07-29 10:55:48 UTC (rev 1508)
+++ trunk/packages/omake/trunk/debian/docs	2005-07-29 17:30:56 UTC (rev 1509)
@@ -1 +1,2 @@
-omake.txt
+doc/html/
+doc/ps/

Deleted: trunk/packages/omake/trunk/debian/files
===================================================================
--- trunk/packages/omake/trunk/debian/files	2005-07-29 10:55:48 UTC (rev 1508)
+++ trunk/packages/omake/trunk/debian/files	2005-07-29 17:30:56 UTC (rev 1509)
@@ -1 +0,0 @@
-omake_0.9.4-1_i386.deb devel optional

Modified: trunk/packages/omake/trunk/debian/patches/01_Makefile_in.dpatch
===================================================================
--- trunk/packages/omake/trunk/debian/patches/01_Makefile_in.dpatch	2005-07-29 10:55:48 UTC (rev 1508)
+++ trunk/packages/omake/trunk/debian/patches/01_Makefile_in.dpatch	2005-07-29 17:30:56 UTC (rev 1509)
@@ -5,59 +5,71 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./Makefile.in /tmp/dpep-work.4y9Ntr/omake-0.9.4/Makefile.in
---- ./Makefile.in	2005-07-02 16:56:33.449411558 -0400
-+++ /tmp/dpep-work.4y9Ntr/omake-0.9.4/Makefile.in	2005-07-02 16:57:12.172359159 -0400
-@@ -1,6 +1,6 @@
+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@
++libdir = $(DESTDIR)/@libdir@
++bindir = $(DESTDIR)/@bindir@
++mandir = $(DESTDIR)/@mandir@
  
  CP = /bin/cp
  LN = @LN_S@
-@@ -41,7 +41,7 @@
- #
- OSH = osh
- OMAKE = omake
--CVSRC = cvs_realclean
-+#CVSRC = cvs_realclean
- GENMAGIC = omake_gen_magic
- GENPARSE = omake_gen_parse
+@@ -41,7 +41,11 @@
+ include Files
  
-@@ -126,8 +126,8 @@
- .PHONY: clean clean-rec install call-omake
+ CMALIBS  = unix.cma
++ifeq ($(OCAMLC),$(OCAMLOPT))
++CMXALIBS = $(CMALIBS)
++else
+ CMXALIBS = unix.cmxa
++endif
  
- clean:
--	rm -f *.opt *.run *.o *.a *.cm* *~ *.aux *.log *.dvi .#* omake_magic.ml omake_ast_parse.ml omake_ast_parse.mli omake_ast_lex.ml Makefile.dep omake_gen_magic omake OMakeroot.install Pervasives.install
--	rm -rf download .omake
-+	rm -f *.opt *.run *.o *.a *.cm* *~ *.aux *.log *.dvi .#* omake_magic.ml omake_ast_parse.ml omake_ast_parse.mli omake_ast_lex.ml Makefile.dep omake_gen_magic omake OMakeroot.install Pervasives.install lm_thread_core.ml lm_thread_pool.ml omake_shell_sys.ml ocaml_patch.ml omake_gen_parse cvs_realclean *.omc *.omo
-+	rm -rf download .omake .omakedb
+ #
+ # Everything
+@@ -61,7 +65,7 @@
+ .PHONY: all
+ .SUFFIXES: .mly .input
  
- clean-rec: clean
+-all: $(OMAKE) $(CVSRC) OMakefile.default OMakeroot.default $(INSTALLFILES) call-omake
++all: $(OMAKE) OMakefile.default OMakeroot.default $(INSTALLFILES) call-omake
  
-@@ -141,14 +141,14 @@
- 	-$(INSTALL) -d $(bindir)
+ #
+ # 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 $(OMAKE).1 $(mandir)/man1/$(OMAKE).1
--	$(INSTALL) -m 444 OMakeroot.install $(libdir)/omake/OMakeroot
+-	$(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 $(OMAKE).1 $(mandir)/man1/$(OMAKE).1
-+	$(INSTALL) -m 644 OMakeroot.install $(libdir)/omake/OMakeroot
++	$(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-07-29 10:55:48 UTC (rev 1508)
+++ trunk/packages/omake/trunk/debian/rules	2005-07-29 17:30:56 UTC (rev 1509)
@@ -73,14 +73,18 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs Changes.txt
-	dh_installdocs
+	dh_installchangelogs CHANGELOG.txt
+	dh_installdocs -XCVS -X.cvsignore
+	rm debian/omake/usr/share/doc/omake/html/images/*.ps
+	rm debian/omake/usr/share/doc/omake/html/images/*.eps
+	rm debian/omake/usr/share/doc/omake/html/images/*.psd
+	rm debian/omake/usr/share/doc/omake/html/images/*.ai
+	rm debian/omake/usr/share/doc/omake/html/images/*.tex
 	dh_installexamples
 	dh_install
-	dh_installman
-	dh_link usr/share/man/man1/omake.1 usr/share/man/man1/osh.1
+	dh_installman doc/man/*.1
 	dh_strip
-	dh_compress
+	dh_compress -Xhtml/
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps

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

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


Property changes on: trunk/packages/omake/trunk/omake_0.9.6.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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