[Pkg-ocaml-maint-commits] r2350 - in trunk/packages/ocamldsort: . trunk trunk/debian upstream

[Samuel Mimram]

Author: smimram
Date: 2006-01-03 20:41:21 +0000 (Tue, 03 Jan 2006)
New Revision: 2350

Added:
   trunk/packages/ocamldsort/trunk/debian/compat
   trunk/packages/ocamldsort/trunk/debian/svn-deblayout
   trunk/packages/ocamldsort/upstream/
   trunk/packages/ocamldsort/upstream/ocamldsort_0.14.3.orig.tar.gz
Removed:
   trunk/packages/ocamldsort/trunk/ocamldsort_0.14.3.orig.tar.gz
Modified:
   trunk/packages/ocamldsort/trunk/debian/
   trunk/packages/ocamldsort/trunk/debian/changelog
   trunk/packages/ocamldsort/trunk/debian/control
   trunk/packages/ocamldsort/trunk/debian/rules
Log:
Switching to svn-buildpackage + updated to OCaml 3.09.0.


Property changes on: trunk/packages/ocamldsort/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/packages/ocamldsort/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamldsort/trunk/debian/changelog	2006-01-03 16:40:23 UTC (rev 2349)
+++ trunk/packages/ocamldsort/trunk/debian/changelog	2006-01-03 20:41:21 UTC (rev 2350)
@@ -1,3 +1,11 @@
+ocamldsort (0.14.3-1.2) unstable; urgency=low
+
+  * NMU.
+  * Updated to OCaml 3.09.0.
+  * Updated standards version to 3.6.2.
+
+ -- Samuel Mimram <smimram at debian.org>  Tue,  3 Jan 2006 21:34:43 +0100
+
 ocamldsort (0.14.3-1.1) unstable; urgency=high
 
   * NMU for the sake of sarge.

Added: trunk/packages/ocamldsort/trunk/debian/compat
===================================================================
--- trunk/packages/ocamldsort/trunk/debian/compat	2006-01-03 16:40:23 UTC (rev 2349)
+++ trunk/packages/ocamldsort/trunk/debian/compat	2006-01-03 20:41:21 UTC (rev 2350)
@@ -0,0 +1 @@
+4

Modified: trunk/packages/ocamldsort/trunk/debian/control
===================================================================
--- trunk/packages/ocamldsort/trunk/debian/control	2006-01-03 16:40:23 UTC (rev 2349)
+++ trunk/packages/ocamldsort/trunk/debian/control	2006-01-03 20:41:21 UTC (rev 2350)
@@ -2,8 +2,8 @@
 Section: devel
 Priority: optional
 Maintainer: Dimitri Ara <debian at mutu.net>
-Build-Depends: ocaml-nox-3.08.3, debhelper (>> 4.0.0)
-Standards-Version: 3.6.1.1
+Build-Depends: ocaml-nox (>= 3.09.0), debhelper (>> 4.0.0)
+Standards-Version: 3.6.2
 
 Package: ocamldsort
 Architecture: any

Modified: trunk/packages/ocamldsort/trunk/debian/rules
===================================================================
--- trunk/packages/ocamldsort/trunk/debian/rules	2006-01-03 16:40:23 UTC (rev 2349)
+++ trunk/packages/ocamldsort/trunk/debian/rules	2006-01-03 20:41:21 UTC (rev 2350)
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -23,28 +20,23 @@
 
 config.status: configure
 	dh_testdir
-	# Add here commands to configure the package.
 	 touch configure.in && sleep 1 && touch configure
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=\$${prefix}/bin --mandir=\$${prefix}/share/man
 
 build: build-stamp
-
 build-stamp:  config.status
 	dh_testdir
 
-	# Add here commands to compile the package.
 	$(MAKE) depend
 	$(MAKE) all
-	#/usr/bin/docbook-to-man debian/ocamldsort.sgml > ocamldsort.1
 
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp
 
-	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
 
 	dh_clean
@@ -55,7 +47,6 @@
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/ocamldsort.
 	$(MAKE) install prefix=$(CURDIR)/debian/ocamldsort/usr
 
 # Build architecture-independent files here.
@@ -66,19 +57,7 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf	
 	dh_installdocs
-#	dh_installexamples
-#	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
 	dh_installchangelogs Changes
 	
 	if test -f $(CURDIR)/debian/ocamldsort/usr/bin/ocamldsort.opt; then \
@@ -90,13 +69,12 @@
 	
 	dh_compress
 	dh_fixperms
-#	dh_makeshlibs
+	dh_makeshlibs
 	dh_installdeb
-#	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install

Added: trunk/packages/ocamldsort/trunk/debian/svn-deblayout
===================================================================
--- trunk/packages/ocamldsort/trunk/debian/svn-deblayout	2006-01-03 16:40:23 UTC (rev 2349)
+++ trunk/packages/ocamldsort/trunk/debian/svn-deblayout	2006-01-03 20:41:21 UTC (rev 2350)
@@ -0,0 +1,3 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamldsort/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocamldsort

Deleted: trunk/packages/ocamldsort/trunk/ocamldsort_0.14.3.orig.tar.gz
===================================================================
(Binary files differ)

Copied: trunk/packages/ocamldsort/upstream/ocamldsort_0.14.3.orig.tar.gz (from rev 2349, trunk/packages/ocamldsort/trunk/ocamldsort_0.14.3.orig.tar.gz)