[SCM] gmerlin/master: Move /usr/share/gmerlin/plugin.sym back into libgmerlin-dev.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Feb 18 16:40:46 UTC 2012


The following commit has been merged in the master branch:
commit e36694a552692c6970f81e55f05caff600becaf7
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Feb 18 17:37:50 2012 +0100

    Move /usr/share/gmerlin/plugin.sym back into libgmerlin-dev.
    
    LP: #935120

diff --git a/debian/control.in b/debian/control.in
index 7d6952d..03a547b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -182,6 +182,8 @@ Depends:
  libxml2-dev,
  pkg-config,
  ${misc:Depends}
+Breaks: libgmerlin-common (<= 1.0.0~dfsg-12)
+Replaces: libgmerlin-common (<= 1.0.0~dfsg-12)
 Description: core library for gmerlin - development files
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
diff --git a/debian/libgmerlin-common.install b/debian/libgmerlin-common.install
index 78ee91a..7a9ffab 100644
--- a/debian/libgmerlin-common.install
+++ b/debian/libgmerlin-common.install
@@ -1,2 +1 @@
 usr/lib/*/gmerlin/bin
-usr/share/gmerlin/plugin.sym
diff --git a/debian/libgmerlin-dev.install b/debian/libgmerlin-dev.install
index b9d8f4c..70bec87 100644
--- a/debian/libgmerlin-dev.install
+++ b/debian/libgmerlin-dev.install
@@ -2,3 +2,4 @@ usr/include
 usr/lib/*/pkgconfig
 usr/lib/*/libgmerlin.so
 usr/lib/*/libgmerlin_gtk.so
+usr/share/gmerlin/plugin.sym

-- 
gmerlin packaging



More information about the pkg-multimedia-commits mailing list