[Pkg-voip-commits] r7279 - in /linphone/trunk/debian: changelog control linphone-common.install

[lmamane at alioth.debian.org]

Author: lmamane
Date: Wed May 27 09:40:30 2009
New Revision: 7279

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7279
Log:
Do not install linphone2.xpm in linphone-common
Really fix #528076

Modified:
    linphone/trunk/debian/changelog
    linphone/trunk/debian/control
    linphone/trunk/debian/linphone-common.install

Modified: linphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/changelog?rev=7279&op=diff
==============================================================================
--- linphone/trunk/debian/changelog (original)
+++ linphone/trunk/debian/changelog Wed May 27 09:40:30 2009
@@ -1,13 +1,14 @@
-linphone (3.1.2-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
+linphone (3.1.2-2) unstable; urgency=low
+
+  [ Kilian Krause ]
   * Remove -N from wget args in get-orig-source target as -O is already
     used.
-  * linphone: Fix file conflict with linphone-common (<= 3.1.1) 
+
+  [ Lionel Elie Mamane ]
+  * linphone: Fix file conflict with linphone-common (<= 3.1.2-1)
     (Closes: #528076)
 
- -- Kilian Krause <kilian at debian.org>  Sun, 10 May 2009 23:32:41 +0200
+ -- Lionel Elie Mamane <lmamane at debian.org>  Wed, 27 May 2009 11:39:51 +0200
 
 linphone (3.1.2-1) unstable; urgency=low
 

Modified: linphone/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/control?rev=7279&op=diff
==============================================================================
--- linphone/trunk/debian/control (original)
+++ linphone/trunk/debian/control Wed May 27 09:40:30 2009
@@ -18,8 +18,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, linphone-nox (=${binary:Version})
 Suggests: yelp
-Conflicts: linphone-common (<= 3.1.1)
-Replaces: linphone-common (<= 3.1.1)
+Replaces: linphone-common (<< 3.1.2-2)
 Description: SIP softphone - graphical client
  Linphone is a is an audio and video internet phone using the SIP protocol. It 
  has a GTK+ and console interface, includes a large variety of audio and video 

Modified: linphone/trunk/debian/linphone-common.install
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/linphone-common.install?rev=7279&op=diff
==============================================================================
--- linphone/trunk/debian/linphone-common.install (original)
+++ linphone/trunk/debian/linphone-common.install Wed May 27 09:40:30 2009
@@ -1,6 +1,6 @@
 usr/share/sounds
 usr/share/gnome
-usr/share/pixmaps
+usr/share/pixmaps/linphone/*.png
 usr/share/linphone
 usr/share/images
 usr/share/locale