[Pkg-ocaml-maint-commits] r4083 - in /trunk/packages/camlp4s/trunk/debian: changelog patches/install_destdir.dpatch

[zack at users.alioth.debian.org]

Author: zack
Date: Mon Jul 16 16:27:05 2007
New Revision: 4083

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4083
Log:
* debian/patches/
  - update install_destdir to match this upstream release

Modified:
    trunk/packages/camlp4s/trunk/debian/changelog
    trunk/packages/camlp4s/trunk/debian/patches/install_destdir.dpatch

Modified: trunk/packages/camlp4s/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp4s/trunk/debian/changelog?rev=4083&op=diff
==============================================================================
--- trunk/packages/camlp4s/trunk/debian/changelog (original)
+++ trunk/packages/camlp4s/trunk/debian/changelog Mon Jul 16 16:27:05 2007
@@ -3,8 +3,10 @@
   * new upstream release
   * debian/watch
     - update to look for camlp5, since upstream changed tarball name to that
+  * debian/patches/
+    - update install_destdir to match this upstream release
 
- -- Stefano Zacchiroli <zack at debian.org>  Mon, 16 Jul 2007 18:22:16 +0200
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 16 Jul 2007 16:25:14 +0000
 
 camlp4s (4.03-1) experimental; urgency=low
 

Modified: trunk/packages/camlp4s/trunk/debian/patches/install_destdir.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp4s/trunk/debian/patches/install_destdir.dpatch?rev=4083&op=diff
==============================================================================
--- trunk/packages/camlp4s/trunk/debian/patches/install_destdir.dpatch (original)
+++ trunk/packages/camlp4s/trunk/debian/patches/install_destdir.dpatch Mon Jul 16 16:27:05 2007
@@ -2,19 +2,18 @@
 ## install_destdir.dpatch by Stefano Zacchiroli <zack at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable installation of stuff under $(DESTDIR)/ via overriding of all
-## DP: path variables defined in config/Makefile (created by ./configure)
+## DP: No description.
 
 @DPATCH@
 diff -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile	2007-07-10 16:09:05.000000000 +0200
-+++ trunk/Makefile	2007-07-10 21:33:33.000000000 +0200
+--- trunk~/Makefile	2007-07-11 09:46:18.000000000 +0000
++++ trunk/Makefile	2007-07-16 16:25:00.000000000 +0000
 @@ -40,10 +40,13 @@
  	for i in $(DIRS) compile; do (cd $$i; $(MAKE) depend); done
  
  install:
 -	@test ! -d "$(LIBDIR)/$(NAME)/Camlp4Parsers" || \
--	 (/bin/rm -rf "$(LIBDIR)/ocamlp4"; \
+-	 (/bin/rm -rf "$(LIBDIR)/omain"; \
 -	  mv "$(LIBDIR)/$(NAME)" "$(LIBDIR)/o$(NAME)")
 -	for i in $(DIRS) compile; do (cd $$i; $(MAKE) install); done
 +	for i in $(DIRS) compile; do (cd $$i; \