[SCM] MLT multimedia framework packaging branch, master, updated. debian/0.7.8-2-5-g250b4da

[Patrick Matthäi]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=de493d1

The following commit has been merged in the master branch:
commit de493d1c083eca5a15260b6e59220925dd41f31c
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Mon Apr 9 13:58:52 2012 +0200

    * Bump SONAME of libmlt and python-mlt to 5.
---
 debian/changelog                            |    3 ++-
 debian/control                              |   22 +++++++++++++---------
 debian/libmlt++3.lintian-overrides          |    2 +-
 debian/libmlt4.lintian-overrides            |    1 -
 debian/{libmlt4.install => libmlt5.install} |    0
 debian/libmlt5.lintian-overrides            |    1 +
 debian/rules                                |    6 +++---
 7 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed32bb4..bb931f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ mlt (0.7.8+git20120409-1) UNRELEASED; urgency=low
   * New upstream git snapshot.
   * Build with --enable-gpl3 and add copyright notices about the transition_vqm
     module.
+  * Bump SONAME of libmlt and python-mlt to 5.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 09 Apr 2012 13:37:00 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 09 Apr 2012 13:58:16 +0200
 
 mlt (0.7.8-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8c1aee8..f997dcd 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Package: libmlt-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
- libmlt4 (= ${binary:Version})
+ libmlt5 (= ${binary:Version})
 Description: multimedia framework (development)
  MLT is an open source multimedia framework, designed and developed for
  television broadcasting. It provides a toolkit for broadcasters, video
@@ -44,7 +44,7 @@ Description: multimedia framework (development)
  This package contains the static libraries and headers for developing
  applications that use the MLT multimedia framework.
 
-Package: libmlt4
+Package: libmlt5
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -53,12 +53,14 @@ Conflicts: libmlt0.2,
  libmlt0.2.5,
  libmlt1,
  libmlt2,
- libmlt3
+ libmlt3,
+ libmlt4
 Replaces: libmlt0.2,
  libmlt0.2.5,
  libmlt1,
  libmlt2,
- libmlt3
+ libmlt3,
+ libmlt4
 Description: multimedia framework (runtime)
  MLT is an open source multimedia framework, designed and developed for
  television broadcasting. It provides a toolkit for broadcasters, video
@@ -73,7 +75,7 @@ Description: multimedia framework (runtime)
 Package: libmlt-data
 Architecture: all
 Depends: ${misc:Depends}
-Enhances: libmlt4
+Enhances: libmlt5
 Description: multimedia framework (data)
  MLT is an open source multimedia framework, designed and developed for
  television broadcasting. It provides a toolkit for broadcasters, video
@@ -125,7 +127,7 @@ Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends},
- libmlt4 (= ${binary:Version}),
+ libmlt5 (= ${binary:Version}),
  libmlt++3 (= ${binary:Version})
 Description: multimedia framework (debugging symbols)
  MLT is an open source multimedia framework, designed and developed for
@@ -148,15 +150,17 @@ Description: command line media player and video editor
  multitrack command line oriented video editor. It could also used as an
  minimalistic media player for audio and video files.
 
-Package: python-mlt3
+Package: python-mlt5
 Architecture: any
 Section: python
 Depends: ${shlibs:Depends},
  ${misc:Depends},
  ${python:Depends}
 Provides: ${python:Provides}
-Conflicts: python-mlt2
-Replaces: python-mlt2
+Conflicts: python-mlt2,
+ python-mlt3
+Replaces: python-mlt2,
+ python-mlt3
 Description: multimedia framework (python bindings)
  MLT is an open source multimedia framework, designed and developed for
  television broadcasting. It provides a toolkit for broadcasters, video
diff --git a/debian/libmlt++3.lintian-overrides b/debian/libmlt++3.lintian-overrides
index deec915..624f963 100644
--- a/debian/libmlt++3.lintian-overrides
+++ b/debian/libmlt++3.lintian-overrides
@@ -1 +1 @@
-libmlt++3: no-symbols-control-file usr/lib/libmlt++.so.0.7.8
+libmlt++3: no-symbols-control-file usr/lib/libmlt++.so.0.7.9
diff --git a/debian/libmlt4.lintian-overrides b/debian/libmlt4.lintian-overrides
deleted file mode 100644
index 719ce7f..0000000
--- a/debian/libmlt4.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libmlt4: no-symbols-control-file usr/lib/libmlt.so.0.7.8
diff --git a/debian/libmlt4.install b/debian/libmlt5.install
similarity index 100%
rename from debian/libmlt4.install
rename to debian/libmlt5.install
diff --git a/debian/libmlt5.lintian-overrides b/debian/libmlt5.lintian-overrides
new file mode 100644
index 0000000..1c90004
--- /dev/null
+++ b/debian/libmlt5.lintian-overrides
@@ -0,0 +1 @@
+libmlt5: no-symbols-control-file usr/lib/libmlt.so.0.7.9
diff --git a/debian/rules b/debian/rules
index 389d3a9..fbd033e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,9 +35,9 @@ override_dh_auto_clean:
 	find \( -name '*.o' -o -name '*.mak' -o -name '.depend' \) -delete
 
 override_dh_install:
-	mkdir -p debian/python-mlt3/$(PYTHON_DIR)
-	install -m 644 src/swig/python/mlt.py debian/python-mlt3/$(PYTHON_DIR)/mlt.py
-	install -m 644 src/swig/python/_mlt.so debian/python-mlt3/$(PYTHON_DIR)/_mlt.so
+	mkdir -p debian/python-mlt5/$(PYTHON_DIR)
+	install -m 644 src/swig/python/mlt.py debian/python-mlt5/$(PYTHON_DIR)/mlt.py
+	install -m 644 src/swig/python/_mlt.so debian/python-mlt5/$(PYTHON_DIR)/_mlt.so
 	dh_install --list-missing
 
 override_dh_strip:

-- 
MLT multimedia framework packaging