[Pkg-ocaml-maint-commits] r5319 - in /trunk/packages/ergo/trunk/debian: changelog control patches/ patches/00list patches/01_Makefile_clean_target.dpatch rules

[dogguy-guest at users.alioth.debian.org]

Author: dogguy-guest
Date: Tue Mar 11 14:56:04 2008
New Revision: 5319

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5319
Log:
Using dpatch to modify upstream's Makefile.in

Added:
    trunk/packages/ergo/trunk/debian/patches/
    trunk/packages/ergo/trunk/debian/patches/00list
    trunk/packages/ergo/trunk/debian/patches/01_Makefile_clean_target.dpatch   (with props)
Modified:
    trunk/packages/ergo/trunk/debian/changelog
    trunk/packages/ergo/trunk/debian/control
    trunk/packages/ergo/trunk/debian/rules

Modified: trunk/packages/ergo/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/debian/changelog?rev=5319&op=diff
==============================================================================
--- trunk/packages/ergo/trunk/debian/changelog (original)
+++ trunk/packages/ergo/trunk/debian/changelog Tue Mar 11 14:56:04 2008
@@ -3,5 +3,6 @@
   * Initial release (Closes: #468557)
   * Install ergoAPI
   * Install ergo.byte
+  * Patch upstream makefile to enhance clean target
 
- -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Fri, 07 Mar 2008 15:55:41 +0100
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Fri, 11 Mar 2008 15:55:41 +0100

Modified: trunk/packages/ergo/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/debian/control?rev=5319&op=diff
==============================================================================
--- trunk/packages/ergo/trunk/debian/control (original)
+++ trunk/packages/ergo/trunk/debian/control Tue Mar 11 14:56:04 2008
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Build-Depends: debhelper (>= 5), autotools-dev, ocaml-nox (>= 3.10.0), libocamlgraph-ocaml-dev
+Build-Depends: debhelper (>= 5), autotools-dev, ocaml-nox (>= 3.10.0), libocamlgraph-ocaml-dev, dpatch
 Homepage: http://ergo.lri.fr
 Standards-Version: 3.7.3
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ergo

Added: trunk/packages/ergo/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/debian/patches/00list?rev=5319&op=file
==============================================================================
--- trunk/packages/ergo/trunk/debian/patches/00list (added)
+++ trunk/packages/ergo/trunk/debian/patches/00list Tue Mar 11 14:56:04 2008
@@ -1,0 +1,1 @@
+01_Makefile_clean_target

Added: trunk/packages/ergo/trunk/debian/patches/01_Makefile_clean_target.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/debian/patches/01_Makefile_clean_target.dpatch?rev=5319&op=file
==============================================================================
--- trunk/packages/ergo/trunk/debian/patches/01_Makefile_clean_target.dpatch (added)
+++ trunk/packages/ergo/trunk/debian/patches/01_Makefile_clean_target.dpatch Tue Mar 11 14:56:04 2008
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_Makefile_clean_target.dpatch by Mehdi Dogguy <dogguy at pps.jussieu.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/Makefile.in trunk/Makefile.in
+--- trunk~/Makefile.in	2008-03-06 19:21:45.000000000 +0100
++++ trunk/Makefile.in	2008-03-11 15:06:32.000000000 +0100
+@@ -324,6 +324,7 @@
+ 
+ clean::
+ 	rm -f *.cm[iox] *.o *~
++	rm -f *.annot *.cmxa *.cma *.a
+ 	rm -f $(GENERATED) parser.output
+ 	rm -f $(NAME).byte $(NAME).opt
+ 	rm -f unittest/*.cm[iox] unittest/*.o unittest/*.annot

Propchange: trunk/packages/ergo/trunk/debian/patches/01_Makefile_clean_target.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/ergo/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ergo/trunk/debian/rules?rev=5319&op=diff
==============================================================================
--- trunk/packages/ergo/trunk/debian/rules (original)
+++ trunk/packages/ergo/trunk/debian/rules Tue Mar 11 14:56:04 2008
@@ -8,6 +8,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -32,7 +34,7 @@
 	--prefix=/usr                           \
 	--mandir=\$${prefix}/share/man
 
-build: build-arch
+build: patch build-arch
 
 build-indep: build-indep-stamp
 build-indep-stamp:
@@ -44,10 +46,10 @@
 	$(MAKE) $(MAKEOPTS) $(OPTTARGET)
 	touch $@
 
-clean: config.status
+clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp build-indep-stamp build-arch-stamp *.annot *.cmxa *.cma *.a
+	rm -f build-stamp build-indep-stamp build-arch-stamp
 	if [ -f Makefile ]; then           \
 		$(MAKE) $(MAKEOPTS) clean; \
 	fi