[Pkg-ocaml-maint-commits] r1960 - trunk/packages/ocaml-fileutils/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-11-09 16:05:06 +0000 (Wed, 09 Nov 2005)
New Revision: 1960

Modified:
   trunk/packages/ocaml-fileutils/trunk/debian/changelog
   trunk/packages/ocaml-fileutils/trunk/debian/copyright
   trunk/packages/ocaml-fileutils/trunk/debian/libfileutils-ocaml-dev.dirs
   trunk/packages/ocaml-fileutils/trunk/debian/rules
Log:
Prepare transition to 3.09: remove libdir reference -- SLG


Modified: trunk/packages/ocaml-fileutils/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/changelog	2005-11-09 15:56:50 UTC (rev 1959)
+++ trunk/packages/ocaml-fileutils/trunk/debian/changelog	2005-11-09 16:05:06 UTC (rev 1960)
@@ -1,3 +1,10 @@
+ocaml-fileutils (0.3.0-7) unstable; urgency=low
+
+  * Remove direct reference to ocaml library dir
+  * Change FSF address in debian/copyright
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 17:03:45 +0100
+
 ocaml-fileutils (0.3.0-6) unstable; urgency=low
 
   * Transition to svn-buildpackage

Modified: trunk/packages/ocaml-fileutils/trunk/debian/copyright
===================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/copyright	2005-11-09 15:56:50 UTC (rev 1959)
+++ trunk/packages/ocaml-fileutils/trunk/debian/copyright	2005-11-09 16:05:06 UTC (rev 1960)
@@ -21,9 +21,8 @@
    GNU Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   along with this package; if not, write to the Free Software Foundation, 
+   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.

Modified: trunk/packages/ocaml-fileutils/trunk/debian/libfileutils-ocaml-dev.dirs
===================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/libfileutils-ocaml-dev.dirs	2005-11-09 15:56:50 UTC (rev 1959)
+++ trunk/packages/ocaml-fileutils/trunk/debian/libfileutils-ocaml-dev.dirs	2005-11-09 16:05:06 UTC (rev 1960)
@@ -1,3 +1,2 @@
-usr/lib/ocaml/3.08.3/fileutils
 usr/share/ocaml-doc
 usr/share/doc/libfileutils-ocaml-dev/html

Modified: trunk/packages/ocaml-fileutils/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-fileutils/trunk/debian/rules	2005-11-09 15:56:50 UTC (rev 1959)
+++ trunk/packages/ocaml-fileutils/trunk/debian/rules	2005-11-09 16:05:06 UTC (rev 1960)
@@ -1,16 +1,17 @@
 #!/usr/bin/make -f
 
-OCAML_LIBDIR=`ocamlc -where`
+OCAMLIBDIR=`ocamlc -where`
+DESTDIR_DEV=$(CURDIR)/debian/libfileutils-ocaml-dev/
 
 include /usr/share/dpatch/dpatch.make 
 
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
-	./configure --prefix=$(CURDIR)/debian/libfileutils-ocaml-dev/usr \
-	 --with-docdir=$(CURDIR)/debian/libfileutils-ocaml-dev/usr/share/ocaml-doc \
-	 --libdir=$(CURDIR)/debian/libfileutils-ocaml-dev/$(OCAML_LIBDIR)
-	touch $@
+	./configure --prefix=$(DESTDIR_DEV)/usr \
+	 --with-docdir=$(DESTDIR_DEV)/usr/share/ocaml-doc \
+	 --libdir=$(DESTDIR_DEV)/$(OCAMLIBDIR)
+	touch configure-stamp
 
 build-arch: configure-stamp build-arch-stamp
 build-arch-stamp:
@@ -32,38 +33,22 @@
 	-$(MAKE) distclean
 	dh_clean
 
-install: DH_OPTIONS=
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	make install 
-	ocamldoc -html -d $(CURDIR)/debian/libfileutils-ocaml-dev/usr/share/doc/libfileutils-ocaml-dev/html \
-	  -load $(CURDIR)/debian/libfileutils-ocaml-dev/usr/share/ocaml-doc/fileutils.odoc
-	ocamlc -I libfileutils-ocaml/ -i libfileutils-ocaml/filePath.ml > $(CURDIR)/debian/libfileutils-ocaml-dev/$(OCAML_LIBDIR)/fileutils/filePath.mli
-	ocamlc -I libfileutils-ocaml/ -i libfileutils-ocaml/fileUtil.ml > $(CURDIR)/debian/libfileutils-ocaml-dev/$(OCAML_LIBDIR)/fileutils/fileUtil.mli
+	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
+	$(MAKE) install 
+	ocamldoc -html -d $(DESTDIR_DEV)/usr/share/doc/libfileutils-ocaml-dev/html \
+	  -load $(DESTDIR_DEV)/usr/share/ocaml-doc/fileutils.odoc
+	ocamlc -I libfileutils-ocaml/ -i libfileutils-ocaml/filePath.ml \
+	  > $(DESTDIR_DEV)/$(OCAMLIBDIR)/fileutils/filePath.mli
+	ocamlc -I libfileutils-ocaml/ -i libfileutils-ocaml/fileUtil.ml \
+	  > $(DESTDIR_DEV)/$(OCAMLIBDIR)/fileutils/fileUtil.mli
 
-install-indep: DH_OPTIONS=
-install-indep: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
+binary-indep: 
 
-binary-indep: build install-indep
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installchangelogs -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a