merge of '81ef71fa69009396b145139571c2cbaa3855d705'

     and 'e5e89d63d424e7df2e0ca809c9cfd4220f57efaa'

18 files changed, 18 insertions, 18 deletions

diff --git a/packages/asterisk/asterisk-addons_1.6.0-beta2.bb b/packages/asterisk/asterisk-addons_1.6.0-beta2.bb
index 9f767ebbff..06d2dc2dc0 100644
--- a/packages/asterisk/asterisk-addons_1.6.0-beta2.bb
+++ b/packages/asterisk/asterisk-addons_1.6.0-beta2.bb
@@ -7,7 +7,7 @@ LICENSE = "GPLv2"
 PRIORITY = "optional"
 SECTION = "console/telephony"
 DEPENDS = "asterisk openssl curl"
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb b/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
index f1b3d12cd7..85fe634f8c 100644
--- a/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-#PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb b/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
index 205c8ff067..74512018e3 100644
--- a/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-#PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb b/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
index 2a46c74f84..0cf23240e7 100644
--- a/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-#PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb b/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
index c29ae60f99..c10bf786a5 100644
--- a/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-#PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb b/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
index 2bea38c99b..ad895b45a0 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-#PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb b/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
index 0656ff1a95..7573043c44 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-#PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb b/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
index 2d74d27996..bf59d9c4aa 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-#PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb b/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
index 6d35c65177..6305d99eb3 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-#PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-${PV}.tar.gz"
 
diff --git a/packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb b/packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb
index 96c662444e..4bd5e52c3f 100644
--- a/packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb
+++ b/packages/asterisk/asterisk-moh-freeplay-alaw_0.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-#PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-alaw.tar.gz"
 
diff --git a/packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb b/packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb
index 581e6bf84f..70595800b9 100644
--- a/packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb
+++ b/packages/asterisk/asterisk-moh-freeplay-g729_0.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-#PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-g729.tar.gz"
 
diff --git a/packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb b/packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb
index e45c3eec4e..0de5cb65e3 100644
--- a/packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb
+++ b/packages/asterisk/asterisk-moh-freeplay-gsm_0.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-#PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-gsm.tar.gz"
 
diff --git a/packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb b/packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb
index e0e0293c34..375f49b38f 100644
--- a/packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb
+++ b/packages/asterisk/asterisk-moh-freeplay-ulaw_0.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE="http://www.asterisk.org"
 SECTION = "voip"
 LICENSE="GPL"
 #DEPENDS="asterisk"
-#PR = "r1"
+PR = "r1"
 
 SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-ulaw.tar.gz"
 
diff --git a/packages/asterisk/asterisk_1.2.24.bb b/packages/asterisk/asterisk_1.2.24.bb
index c57707eb2a..497866f422 100644
--- a/packages/asterisk/asterisk_1.2.24.bb
+++ b/packages/asterisk/asterisk_1.2.24.bb
@@ -5,7 +5,7 @@ HOMEPAGE="www.asterisk.org"
 LICENSE="GPL"
 DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis speex"
 SECTION = "console/telephony"
-PR = "r0"
+PR = "r1"
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
 	 file://uclibc-compat-getloadavg.patch;patch=1 \
diff --git a/packages/asterisk/asterisk_1.2.28.bb b/packages/asterisk/asterisk_1.2.28.bb
index 90e756bf66..a79d81b694 100644
--- a/packages/asterisk/asterisk_1.2.28.bb
+++ b/packages/asterisk/asterisk_1.2.28.bb
@@ -5,7 +5,7 @@ HOMEPAGE="www.asterisk.org"
 LICENSE="GPL"
 DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis speex"
 SECTION = "console/telephony"
-PR = "r0"
+PR = "r1"
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
 	 file://uclibc-compat-getloadavg.patch;patch=1 \
diff --git a/packages/asterisk/asterisk_1.4.17.bb b/packages/asterisk/asterisk_1.4.17.bb
index 46bc90b25f..75a08ece60 100644
--- a/packages/asterisk/asterisk_1.4.17.bb
+++ b/packages/asterisk/asterisk_1.4.17.bb
@@ -8,7 +8,7 @@ PRIORITY = "optional"
 SECTION = "console/telephony"
 DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
 #RRECOMMENDS_${PN} = "logrotate"
-PR = "r0"
+PR = "r1"
 
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\
diff --git a/packages/asterisk/asterisk_1.4.19.1.bb b/packages/asterisk/asterisk_1.4.19.1.bb
index 2e05896cc6..31c8f541a4 100644
--- a/packages/asterisk/asterisk_1.4.19.1.bb
+++ b/packages/asterisk/asterisk_1.4.19.1.bb
@@ -7,7 +7,7 @@ PRIORITY = "optional"
 SECTION = "console/telephony"
 DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
 #RRECOMMENDS_${PN} = "logrotate"
-PR = "r0"
+PR = "r1"
 
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\
diff --git a/packages/asterisk/asterisk_1.6.0-beta8.bb b/packages/asterisk/asterisk_1.6.0-beta8.bb
index 202b689a68..79c1d359a1 100644
--- a/packages/asterisk/asterisk_1.6.0-beta8.bb
+++ b/packages/asterisk/asterisk_1.6.0-beta8.bb
@@ -8,7 +8,7 @@ PRIORITY = "optional"
 SECTION = "console/telephony"
 DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
 #RRECOMMENDS_${PN} = "logrotate"
-PR = "r0"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"