[Pkg-ocaml-maint-commits] r6442 - in /trunk/packages/ocaml-tools/trunk/debian: changelog docs install rules

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Jul 19 15:46:06 2009
New Revision: 6442

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6442
Log:
debian/rules: delegate file installation do appropriate dh_*

Modified:
    trunk/packages/ocaml-tools/trunk/debian/changelog
    trunk/packages/ocaml-tools/trunk/debian/docs
    trunk/packages/ocaml-tools/trunk/debian/install
    trunk/packages/ocaml-tools/trunk/debian/rules

Modified: trunk/packages/ocaml-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/changelog?rev=6442&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-tools/trunk/debian/changelog Sun Jul 19 15:46:06 2009
@@ -13,6 +13,7 @@
     - fix path pointing to GPL-2 (omlet's license)
     - change encoding to UTF-8
   * debian/compat: bump to 5 (minimum, non deprecated level)
+  * debian/rules: delegate file installation do appropriate dh_*
 
   [ Ralf Treinen ]
   * changed section to ocaml

Modified: trunk/packages/ocaml-tools/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/docs?rev=6442&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/docs (original)
+++ trunk/packages/ocaml-tools/trunk/debian/docs Sun Jul 19 15:46:06 2009
@@ -1,2 +1,4 @@
 ocaml-autoconf/README.ocaml-autoconf
 ocaml-autoconf/ocaml.m4.txt
+omlet-*/README.omlet
+omlet-*/changelog.omlet

Modified: trunk/packages/ocaml-tools/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/install?rev=6442&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/install (original)
+++ trunk/packages/ocaml-tools/trunk/debian/install Sun Jul 19 15:46:06 2009
@@ -1,2 +1,10 @@
+# OCaml autoconf
 ocaml-autoconf/ocaml.m4		/usr/share/ocaml-autoconf
 ocaml-autoconf/ocaml.m4.txt	/usr/share/doc/ocaml-tools
+
+# omlet
+debian/vim-omlet.yaml		/usr/share/vim/registry
+
+# autoconf samples
+autoconf/configure.in		/usr/share/ocaml-tools
+autoconf/Makefile.in		/usr/share/ocaml-tools

Modified: trunk/packages/ocaml-tools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/rules?rev=6442&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/rules (original)
+++ trunk/packages/ocaml-tools/trunk/debian/rules Sun Jul 19 15:46:06 2009
@@ -17,12 +17,14 @@
 build:
 	$(MAKE) -C ocaml-autoconf/
 	cp ocaml-autoconf/README ocaml-autoconf/README.ocaml-autoconf
+	cd omlet-* && (cp README README.omlet ; cp ChangeLog changelog.omlet)
 
 clean: 
 	dh_testdir
 	dh_testroot
 	$(MAKE) -C ocaml-autoconf/ clean
 	rm -f ocaml-autoconf/README.ocaml-autoconf
+	rm -f omlet-*/README.omlet omlet-*/changelog.omlet
 	dh_clean
 
 install:
@@ -30,16 +32,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
-	# autoconf
-	cp autoconf/configure.in $(DESTDIR)/$(SHDIR)
-	cp autoconf/Makefile.in $(DESTDIR)/$(SHDIR)
-
-	# omlet
 	BASE=$(DESTDIR)/$(VIMDIR) make -C $(OMLETSRC) install-aux
-	cp debian/vim-omlet.yaml $(DESTDIR)/usr/share/vim/registry
-	cp $(OMLETSRC)/README $(DESTDIR)/$(DOCDIR)/README.omlet
-	cp $(OMLETSRC)/ChangeLog $(DESTDIR)/$(DOCDIR)/changelog.omlet
 
 	cp debian/lintian-overrides \
 		debian/ocaml-tools/usr/share/lintian/overrides/ocaml-tools