[Pkg-ocaml-maint-commits] r3075 - in /trunk/packages/postgresql-ocaml: trunk/debian/ trunk/debian/patches/ upstream/

[zack at users.alioth.debian.org]

Author: zack
Date: Wed Sep  6 16:25:48 2006
New Revision: 3075

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3075
Log:
binNMU safe debian/* setting

Added:
    trunk/packages/postgresql-ocaml/upstream/postgresql-ocaml_1.5.4.orig.tar.gz   (with props)
Removed:
    trunk/packages/postgresql-ocaml/trunk/debian/patches/03_examples.dpatch
    trunk/packages/postgresql-ocaml/upstream/postgresql-ocaml_1.4.6.orig.tar.gz
Modified:
    trunk/packages/postgresql-ocaml/trunk/debian/changelog
    trunk/packages/postgresql-ocaml/trunk/debian/control
    trunk/packages/postgresql-ocaml/trunk/debian/patches/00list
    trunk/packages/postgresql-ocaml/trunk/debian/rules

Modified: trunk/packages/postgresql-ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml/trunk/debian/changelog?rev=3075&op=diff
==============================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/changelog (original)
+++ trunk/packages/postgresql-ocaml/trunk/debian/changelog Wed Sep  6 16:25:48 2006
@@ -1,8 +1,17 @@
-postgresql-ocaml (1.4.6-8) unstable; urgency=low
+postgresql-ocaml (1.5.4-1) unstable; urgency=low
 
+  * New upstream release
+  * debian/patches/05_meta
+    - commented out this patch, in this upstream release version number in
+      META matches library version
   * debian/rules
     - removed no longer needed workaround for cdbs + dpatch
     - avoid to create debian/control from debian/control.in on ocamlinit
+    - special handling of debian/patches/03_examples:
+      + for the examples to be binNMU safe the patch needs to be filled as
+        other .in files -> added the patch to OFILES
+      + for dpatch to work with a .in patch, the patch must be instantiated
+        before cleaning -> added a cdbs pre-clean dep on ocamlinit
   * debian/control.in
     - file removed, no longer needed
   * debian/watch

Modified: trunk/packages/postgresql-ocaml/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml/trunk/debian/control?rev=3075&op=diff
==============================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/control (original)
+++ trunk/packages/postgresql-ocaml/trunk/debian/control Wed Sep  6 16:25:48 2006
@@ -5,19 +5,6 @@
 Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.2), ocaml-findlib (>= 1.1), libpq-dev, dpatch, cdbs
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml
-
-Package: libpostgresql-ocaml
-Architecture: any
-Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
-Description: OCaml bindings to PostgreSQL's libpq
- This OCaml-library provides an interface to PostgreSQL, an
- efficient and reliable, open source, relational database.
- Almost all functionality available through the C-API (libpq) is
- replicated in a type-safe way. This library uses objects for
- representing database connections and results of queries.
- .
- This package contains only the shared runtime stub libraries.
 
 Package: libpostgresql-ocaml-dev
 Architecture: any
@@ -33,3 +20,16 @@
  This package contains all the development stuff you need to use
  OCaml Postgres bindings in your programs.
 
+Package: libpostgresql-ocaml
+Architecture: any
+Section: libs
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Description: OCaml bindings to PostgreSQL's libpq
+ This OCaml-library provides an interface to PostgreSQL, an
+ efficient and reliable, open source, relational database.
+ Almost all functionality available through the C-API (libpq) is
+ replicated in a type-safe way. This library uses objects for
+ representing database connections and results of queries.
+ .
+ This package contains only the shared runtime stub libraries.
+

Modified: trunk/packages/postgresql-ocaml/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml/trunk/debian/patches/00list?rev=3075&op=diff
==============================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/patches/00list (original)
+++ trunk/packages/postgresql-ocaml/trunk/debian/patches/00list Wed Sep  6 16:25:48 2006
@@ -1,3 +1,2 @@
 01_makefile
 03_examples
-05_meta

Modified: trunk/packages/postgresql-ocaml/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml/trunk/debian/rules?rev=3075&op=diff
==============================================================================
--- trunk/packages/postgresql-ocaml/trunk/debian/rules (original)
+++ trunk/packages/postgresql-ocaml/trunk/debian/rules Wed Sep  6 16:25:48 2006
@@ -14,6 +14,14 @@
 ocamlinit:
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
 makebuilddir/$(PKGNAME):: ocamlinit
+
+ # The examples patch needs to be patched since it contains hard coded ABI
+ # numbers.
+OFILES += debian/patches/03_examples.dpatch
+
+ # Since dpatch fails to deapply if a patch is not there we need to
+ # instantiate the patch before cleaning.
+cleanbuilddir/$(PKGNAME):: ocamlinit
 
 DEB_SRCDIR = $(CURDIR)/lib
 DEB_MAKE_BUILD_TARGET = byte-code-library

Added: trunk/packages/postgresql-ocaml/upstream/postgresql-ocaml_1.5.4.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/postgresql-ocaml/upstream/postgresql-ocaml_1.5.4.orig.tar.gz?rev=3075&op=file
==============================================================================
Binary file - no diff available.

Propchange: trunk/packages/postgresql-ocaml/upstream/postgresql-ocaml_1.5.4.orig.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream