[Pkg-ocaml-maint-commits] r3604 - in /trunk/packages/ocamlodbc/trunk/debian: changelog control libocamlodbc-ocaml-bin.dirs libocamlodbc-ocaml-bin.install libocamlodbc-ocaml-bin.override libocamlodbc-ocaml-dev.examples rules

[smimram at users.alioth.debian.org]

Author: smimram
Date: Sat Mar 10 22:27:05 2007
New Revision: 3604

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3604
Log:
Don't provide biniki anymore.

Removed:
    trunk/packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.dirs
    trunk/packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.install
    trunk/packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.override
Modified:
    trunk/packages/ocamlodbc/trunk/debian/changelog
    trunk/packages/ocamlodbc/trunk/debian/control
    trunk/packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.examples
    trunk/packages/ocamlodbc/trunk/debian/rules

Modified: trunk/packages/ocamlodbc/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlodbc/trunk/debian/changelog?rev=3604&op=diff
==============================================================================
--- trunk/packages/ocamlodbc/trunk/debian/changelog (original)
+++ trunk/packages/ocamlodbc/trunk/debian/changelog Sat Mar 10 22:27:05 2007
@@ -1,8 +1,12 @@
 ocamlodbc (2.12-1) experimental; urgency=low
 
   * New upstream release.
+  * Not providing the libocamlodbc-ocaml-bin package anymore, biniki was a toy
+    example and is now provided as an example in libocamlodbc-ocaml-dev,
+    closes: #354946.
   * Removed lablgtk2.dpatch, integrated upstream.
   * We don't need to remove rpaths anymore.
+  * Updated package description.
   * Updated standards version to 3.7.2, no changes needed.
 
  -- Samuel Mimram <smimram at debian.org>  Wed, 28 Feb 2007 18:47:42 +0100

Modified: trunk/packages/ocamlodbc/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlodbc/trunk/debian/control?rev=3604&op=diff
==============================================================================
--- trunk/packages/ocamlodbc/trunk/debian/control (original)
+++ trunk/packages/ocamlodbc/trunk/debian/control Sat Mar 10 22:27:05 2007
@@ -17,12 +17,3 @@
  many different databases from within OCaml.
  .
  This package provides the development and documentation file.
-
-Package: libocamlodbc-ocaml-bin
-Section: misc
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Graphical, multi-database access application
- This package provides biniki, a graphical application to run SQL queries
- on a database over ODBC, which is part of the ocamlodbc bindings to the
- UnixODBC library.

Modified: trunk/packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.examples
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.examples?rev=3604&op=diff
==============================================================================
--- trunk/packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.examples (original)
+++ trunk/packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-dev.examples Sat Mar 10 22:27:05 2007
@@ -1,1 +1,2 @@
 Exemples/*.ml
+Biniki

Modified: trunk/packages/ocamlodbc/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlodbc/trunk/debian/rules?rev=3604&op=diff
==============================================================================
--- trunk/packages/ocamlodbc/trunk/debian/rules (original)
+++ trunk/packages/ocamlodbc/trunk/debian/rules Sat Mar 10 22:27:05 2007
@@ -43,8 +43,6 @@
 
 	$(MAKE) depend
 	$(MAKE) unixodbc
-	cd Biniki && make en
-	cd Biniki && make unixodbc
 	-mkdir html
 	ocamldoc -html -d html ocamlodbc.mli
 
@@ -57,8 +55,6 @@
 
 	-$(MAKE) clean_all
 	-$(MAKE) distclean
-	-cd Biniki && $(MAKE) clean_all
-	-rm -f Biniki/biniki_messages.ml config.{log,status} master.Makefile
 	-rm -rf unixodbc html
 
 	dh_clean
@@ -70,23 +66,12 @@
 	dh_installdirs
 
 	mkdir -p $(DESTDIR)
-#	$(MAKE) direct_install prefix=$(CURDIR)/debian/tmp/usr DESTDIR=$(CURDIR)/debian/tmp
-#	mv $(DESTDIR)/ocamlodbc/unixodbc/* $(DESTDIR)/ocamlodbc; rmdir $(DESTDIR)/ocamlodbc/unixodbc
 	$(MAKE) findlib_install prefix=$(CURDIR)/debian/tmp/usr OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 	mv $(DESTDIR)/ocamlodbc_unixodbc $(DESTDIR)/ocamlodbc
 	sed -e 's/ocamlodbc_unixodbc/ocamlodbc/g' $(DESTDIR)/ocamlodbc/META > $(DESTDIR)/ocamlodbc/META
-	mkdir -p debian/tmp/usr/bin
-	if [ -f Biniki/biniki.opt ]; then \
-		cp Biniki/biniki.opt \
-		debian/tmp/usr/bin/biniki; \
-	else \
-		cp Biniki/biniki debian/tmp/usr/bin; \
-	fi
-	install -m 644 debian/libocamlodbc-ocaml-bin.override debian/libocamlodbc-ocaml-bin/usr/share/lintian/overrides/libocamlodbc-ocaml-bin
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
 # Build architecture-dependent files here.
 binary-arch: build install
@@ -95,10 +80,11 @@
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installexamples
+	rm -f debian/libocamlodbc-ocaml-dev/usr/share/doc/libocamlodbc-ocaml-dev/examples/Biniki/.cvsignore
 	dh_install --sourcedir=debian/tmp --list-missing
 	dh_installman
 	dh_link
-	dh_strip -Xbiniki
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs