[Pkg-voip-commits] r5941 - in /asterisk/trunk/debian: asterisk-dev.links asterisk.links changelog control

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Mon Jul 14 09:52:07 2008
New Revision: 5941

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5941
Log:
* The asterisk.h symlink moved to asterisk-dev where it should be.
* Hence asterisk-dev now conflicts with older asterisk.

Added:
    asterisk/trunk/debian/asterisk-dev.links
Modified:
    asterisk/trunk/debian/asterisk.links
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/control

Added: asterisk/trunk/debian/asterisk-dev.links
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk-dev.links?rev=5941&op=file
==============================================================================
--- asterisk/trunk/debian/asterisk-dev.links (added)
+++ asterisk/trunk/debian/asterisk-dev.links Mon Jul 14 09:52:07 2008
@@ -1,0 +1,1 @@
+usr/include/asterisk/asterisk.h		usr/include/asterisk.h

Modified: asterisk/trunk/debian/asterisk.links
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk.links?rev=5941&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk.links (original)
+++ asterisk/trunk/debian/asterisk.links Mon Jul 14 09:52:07 2008
@@ -1,4 +1,3 @@
 usr/share/man/man8/asterisk.8		usr/share/man/man8/rasterisk.8
 usr/local/share/asterisk/sounds		usr/share/asterisk/sounds/custom
 var/lib/asterisk/sounds/custom		usr/share/asterisk/sounds/recordings
-usr/include/asterisk/asterisk.h		usr/include/asterisk.h

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5941&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Jul 14 09:52:07 2008
@@ -2,6 +2,8 @@
 
   * New upstream bugfix release.
   * Fix get-orig-source target to remove temporary files left in that tarball.
+  * The asterisk.h symlink moved to asterisk-dev where it should be.
+  * Hence asterisk-dev now conflicts with older asterisk.
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 30 Jun 2008 20:46:07 +0300
 

Modified: asterisk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/control?rev=5941&op=diff
==============================================================================
--- asterisk/trunk/debian/control (original)
+++ asterisk/trunk/debian/control Mon Jul 14 09:52:07 2008
@@ -76,6 +76,7 @@
 Recommends: asterisk
 Section: devel
 Priority: extra
+Conflicts: asterisk (<= 1:1.4.21.1~dfsg-1)
 Description: Development files for Asterisk
  Asterisk is an Open Source PBX and telephony toolkit.
  .