[Pkg-ocaml-maint-commits] r2869 - in /trunk/packages/menhir: trunk/debian/ trunk/debian/patches/ upstream/

smimram at users.alioth.debian.org smimram at users.alioth.debian.org
Sat Jun 24 19:28:24 UTC 2006


Author: smimram
Date: Sat Jun 24 19:28:23 2006
New Revision: 2869

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2869
Log:
New upstream release.

Added:
    trunk/packages/menhir/trunk/debian/dirs
    trunk/packages/menhir/trunk/debian/patches/manpage.dpatch   (with props)
    trunk/packages/menhir/upstream/menhir_20060615.orig.tar.gz   (with props)
Removed:
    trunk/packages/menhir/trunk/debian/menhir.1
    trunk/packages/menhir/trunk/debian/patches/makefile.dpatch
    trunk/packages/menhir/upstream/menhir_20060412.orig.tar.gz
Modified:
    trunk/packages/menhir/trunk/debian/changelog
    trunk/packages/menhir/trunk/debian/control
    trunk/packages/menhir/trunk/debian/patches/00list
    trunk/packages/menhir/trunk/debian/rules

Modified: trunk/packages/menhir/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/menhir/trunk/debian/changelog?rev=2869&op=diff
==============================================================================
--- trunk/packages/menhir/trunk/debian/changelog (original)
+++ trunk/packages/menhir/trunk/debian/changelog Sat Jun 24 19:28:23 2006
@@ -1,3 +1,12 @@
+menhir (20060615-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed makefile.dpatch, found a better way to use the makefile.
+  * Added manpage.dpatch to remove invalid characters from the manpage.
+  * Updated standards version to 3.7.2, no changes needed.
+
+ -- Samuel Mimram <smimram at debian.org>  Sat, 24 Jun 2006 19:06:02 +0000
+
 menhir (20060412-1) unstable; urgency=low
 
   * Initial release, closes: #363539.

Modified: trunk/packages/menhir/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/menhir/trunk/debian/control?rev=2869&op=diff
==============================================================================
--- trunk/packages/menhir/trunk/debian/control (original)
+++ trunk/packages/menhir/trunk/debian/control Sat Jun 24 19:28:23 2006
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
 Build-Depends: debhelper (>= 4.0.0), dpatch, ocaml-nox (>= 3.09), ocaml-findlib
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: menhir
 Architecture: any

Added: trunk/packages/menhir/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/menhir/trunk/debian/dirs?rev=2869&op=file
==============================================================================
--- trunk/packages/menhir/trunk/debian/dirs (added)
+++ trunk/packages/menhir/trunk/debian/dirs Sat Jun 24 19:28:23 2006
@@ -1,0 +1,2 @@
+usr/bin
+usr/share/menhir

Modified: trunk/packages/menhir/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/menhir/trunk/debian/patches/00list?rev=2869&op=diff
==============================================================================
--- trunk/packages/menhir/trunk/debian/patches/00list (original)
+++ trunk/packages/menhir/trunk/debian/patches/00list Sat Jun 24 19:28:23 2006
@@ -1,1 +1,1 @@
-makefile
+manpage

Added: trunk/packages/menhir/trunk/debian/patches/manpage.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/menhir/trunk/debian/patches/manpage.dpatch?rev=2869&op=file
==============================================================================
--- trunk/packages/menhir/trunk/debian/patches/manpage.dpatch (added)
+++ trunk/packages/menhir/trunk/debian/patches/manpage.dpatch Sat Jun 24 19:28:23 2006
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## manpage.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove some invalid characters.
+
+ at DPATCH@
+diff -urNad menhir-20060615~/menhir.1 menhir-20060615/menhir.1
+--- menhir-20060615~/menhir.1	2006-06-15 07:26:06.000000000 +0000
++++ menhir-20060615/menhir.1	2006-06-24 19:25:19.000000000 +0000
+@@ -119,7 +119,7 @@
+ 
+ .SH AUTHOR
+ .B menhir
+-was written by François Pottier and Yann Régis-Gianas.
++was written by Francois Pottier and Yann Regis-Gianas.
+ .PP
+ This manual page was written by Samuel Mimram <smimram at debian.org>,
+ for the Debian project (but may be used by others).

Propchange: trunk/packages/menhir/trunk/debian/patches/manpage.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/menhir/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/menhir/trunk/debian/rules?rev=2869&op=diff
==============================================================================
--- trunk/packages/menhir/trunk/debian/rules (original)
+++ trunk/packages/menhir/trunk/debian/rules Sat Jun 24 19:28:23 2006
@@ -12,13 +12,16 @@
 # Include dpatch stuff.
 include /usr/share/dpatch/dpatch.make
 
+DESTDIR := $(CURDIR)/debian/menhir
+
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
 	if [ -e /usr/bin/ocamlopt ]; then \
-		$(MAKE); \
+		$(MAKE) menhir; \
 	else \
-		$(MAKE) BEST=byte; \
+		$(MAKE) menhir.byte; \
+		mv menhir.byte menhir; \
 	fi
 	touch build-stamp
 
@@ -37,8 +40,9 @@
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) install PREFIX=$(CURDIR)/debian/menhir/usr
-	rm -rf $(CURDIR)/debian/menhir/usr/doc
+#	$(MAKE) install PREFIX=$(CURDIR)/debian/menhir/usr
+	cp menhir $(DESTDIR)/usr/bin/
+	cp standard.mly $(DESTDIR)/usr/share/menhir/
 
 
 # Build architecture-independent files here.
@@ -53,10 +57,10 @@
 	dh_installdocs
 	dh_installexamples
 	dh_install
-	dh_installman debian/menhir.1
+	dh_installman menhir.1
 	dh_link
 	dh_strip
-	dh_compress
+	dh_compress -X.pdf
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps

Added: trunk/packages/menhir/upstream/menhir_20060615.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/menhir/upstream/menhir_20060615.orig.tar.gz?rev=2869&op=file
==============================================================================
Binary file - no diff available.

Propchange: trunk/packages/menhir/upstream/menhir_20060615.orig.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream




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