[Pkg-ocaml-maint-commits] [SCM] lablgtk2 packaging branch, master, updated. debian/2.14.0+dfsg-1-1-g0c44bd5

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 0c44bd5422ce42e64f5dfe124d054f3d7ac4d149
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Nov 29 19:20:53 2009 +0100

    Prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 30720cf..af6d998 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lablgtk2 (2.14.0+dfsg-2) unstable; urgency=low
+
+  * Upload to unstable
+  * Make liblablgtksourceview2-* replace/conflict with previous version
+
+ -- Stéphane Glondu <glondu at debian.org>  Sun, 29 Nov 2009 19:20:34 +0100
+
 lablgtk2 (2.14.0+dfsg-1) experimental; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 19af4a4..f1507e0 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,8 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Provides: ${ocaml:Provides}
+Replaces: liblablgtksourceview-ocaml
+Conflicts: liblablgtksourceview-ocaml
 Description: OCaml bindings for libgtksourceview2 (runtime)
  This is the OCaml binding for the GtkSourceView2 widget, a text widget that
  extends the standard GTK+ 2.x text widget with syntax highlighting and other
@@ -144,7 +146,8 @@ Depends:
  ${misc:Depends}
 Provides: ${ocaml:Provides}
 Recommends: liblablgtk2-ocaml-doc
-Replaces: liblablgtk2-ocaml-dev (<= 2.10.0-2)
+Replaces: liblablgtksourceview-ocaml-dev
+Conflicts: liblablgtksourceview-ocaml-dev
 Description: OCaml bindings for libgtksourceview2, a source editor GTK+ widget
  This is the OCaml binding for the GtkSourceView2 widget, a text widget that
  extends the standard GTK+ 2.x text widget with syntax highlighting and other
diff --git a/debian/gbp.conf b/debian/gbp.conf
index dfa07a0..cec628c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,4 +1,2 @@
 [DEFAULT]
 pristine-tar = True
-upstream-branch = experimental/upstream
-debian-branch = experimental/master

-- 
lablgtk2 packaging