[Pkg-ocaml-maint-commits] r3336 - in /trunk/packages/omake: trunk/ trunk/debian/ trunk/debian/patches/ upstream/

mfurr at users.alioth.debian.org mfurr at users.alioth.debian.org
Tue Nov 14 22:41:47 CET 2006 

Author: mfurr
Date: Tue Nov 14 22:41:24 2006
New Revision: 3336

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3336
Log:
New upstream release + move to svn-buildpackage layout

Added:
    trunk/packages/omake/trunk/debian/control
      - copied, changed from r3335, trunk/packages/omake/trunk/debian/control.in
    trunk/packages/omake/trunk/debian/patches/00list
    trunk/packages/omake/trunk/debian/patches/10_Makefile.dpatch   (with props)
    trunk/packages/omake/trunk/debian/svn-deblayout
    trunk/packages/omake/upstream/
    trunk/packages/omake/upstream/omake_0.9.6.9-1.orig.tar.gz   (with props)
Removed:
    trunk/packages/omake/trunk/debian/control.in
    trunk/packages/omake/trunk/omake_0.9.6.8-1.orig.tar.gz
Modified:
    trunk/packages/omake/trunk/debian/   (props changed)
    trunk/packages/omake/trunk/debian/changelog
    trunk/packages/omake/trunk/debian/rules

Propchange: trunk/packages/omake/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Modified: trunk/packages/omake/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/changelog?rev=3336&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/changelog (original)
+++ trunk/packages/omake/trunk/debian/changelog Tue Nov 14 22:41:24 2006
@@ -1,3 +1,20 @@
+omake (0.9.6.9-1-1) unstable; urgency=low
+
+  * New upstream release 
+  * Acknowledge NMU and add patch to patches dir (Closes: 397699)
+  * Convert to svn-buildpackage layout
+  * Change control.in back to control
+
+ -- Mike Furr <mfurr at debian.org>  Tue, 14 Nov 2006 16:40:12 -0500
+
+omake (0.9.6.8-1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Don't touch boot/Makefile.dep in the toplevel Makefile, we want it to be
+    regenerated after that (closes: #397699).
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Fri, 10 Nov 2006 15:43:13 +0100
+
 omake (0.9.6.8-1-1) unstable; urgency=low
 
   * New upstream release 

Copied: trunk/packages/omake/trunk/debian/control (from r3335, trunk/packages/omake/trunk/debian/control.in)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/control?rev=3336&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/control.in (original)
+++ trunk/packages/omake/trunk/debian/control Tue Nov 14 22:41:24 2006
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, ocaml-nox (>= #OCamlABI#), libfam-dev, libreadline5-dev, libncurses5-dev, dpatch
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, ocaml-nox (>= 3.09.2), libfam-dev, libreadline5-dev, libncurses5-dev, dpatch
 Standards-Version: 3.6.2
 
 Package: omake

Added: trunk/packages/omake/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/patches/00list?rev=3336&op=file
==============================================================================
--- trunk/packages/omake/trunk/debian/patches/00list (added)
+++ trunk/packages/omake/trunk/debian/patches/00list Tue Nov 14 22:41:24 2006
@@ -1,0 +1,1 @@
+10_Makefile

Added: trunk/packages/omake/trunk/debian/patches/10_Makefile.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/patches/10_Makefile.dpatch?rev=3336&op=file
==============================================================================
--- trunk/packages/omake/trunk/debian/patches/10_Makefile.dpatch (added)
+++ trunk/packages/omake/trunk/debian/patches/10_Makefile.dpatch Tue Nov 14 22:41:24 2006
@@ -1,0 +1,19 @@
+#! /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 omake-0.9.6.9~/Makefile omake-0.9.6.9/Makefile
+--- omake-0.9.6.9~/Makefile	2005-09-07 20:43:14.000000000 -0400
++++ omake-0.9.6.9/Makefile	2006-11-14 16:35:52.053811307 -0500
+@@ -18,7 +18,7 @@
+ 	@exit 1
+ 
+ boot: boot/Makefile
+-	@touch boot/Makefile.dep
++#	@touch boot/Makefile.dep
+ 	@cd boot; $(MAKE) Makefile.dep; $(MAKE) omake
+ 	@ln -sf boot/omake omake-boot
+ 

Propchange: trunk/packages/omake/trunk/debian/patches/10_Makefile.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/omake/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/rules?rev=3336&op=diff
==============================================================================
--- trunk/packages/omake/trunk/debian/rules (original)
+++ trunk/packages/omake/trunk/debian/rules Tue Nov 14 22:41:24 2006
@@ -13,15 +13,6 @@
 PACKAGE=omake
 include /usr/share/dpatch/dpatch.make
 OCAMLABI = $(shell ocamlc -version)
-
-ABI_FILES = $(wildcard debian/*.in)
-
-.PHONY: transition
-
-transition: $(ABI_FILES)
-	for t in $^; do \
-	    sed -e 's%#OCamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
-	done
 
 build: build-stamp
 build-stamp: patch

Added: trunk/packages/omake/trunk/debian/svn-deblayout
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/trunk/debian/svn-deblayout?rev=3336&op=file
==============================================================================
--- trunk/packages/omake/trunk/debian/svn-deblayout (added)
+++ trunk/packages/omake/trunk/debian/svn-deblayout Tue Nov 14 22:41:24 2006
@@ -1,0 +1,4 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/omake/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/omake
+

Added: trunk/packages/omake/upstream/omake_0.9.6.9-1.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/omake/upstream/omake_0.9.6.9-1.orig.tar.gz?rev=3336&op=file
==============================================================================
Binary file - no diff available.

Propchange: trunk/packages/omake/upstream/omake_0.9.6.9-1.orig.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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