[Pkg-voip-commits] [asterisk] 01/01: revert removal of astdb2*

[Jeremy Lainé]

This is an automated email from the git hooks/post-receive script.

sharky pushed a commit to branch master
in repository asterisk.

commit 947ab9db855c433639f5d03e1eede2b8913bf591
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Wed Dec 11 09:28:01 2013 +0100

    revert removal of astdb2*
---
 debian/changelog            |  3 ---
 debian/patches/astdb_remove | 18 ------------------
 debian/patches/series       |  2 +-
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72c1fce..8983e4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,5 @@
 asterisk (1:11.6.0~dfsg-2) UNRELEASED; urgency=medium
 
-  [ Jeremy Lainé ]
-  * Do not build astdb2* (GPL linked against 4-clause BSD).
-  
   [ Tzafrir Cohen ]
   * Restore SE Linux settings on directories created in init script
     (Russell Coker, Closes: #731397). 
diff --git a/debian/patches/astdb_remove b/debian/patches/astdb_remove
deleted file mode 100644
index ca57423..0000000
--- a/debian/patches/astdb_remove
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Do not build astdb2* (GPL linked against 4-clause BSD)
-Author: Jeremy Lainé <jeremy.laine at m4x.org>
---- a/utils/utils.xml
-+++ b/utils/utils.xml
-@@ -8,11 +8,11 @@
- 	<support_level>core</support_level>
-   </member>
-   <member name="astdb2sqlite3">
--	<defaultenabled>yes</defaultenabled>
-+	<defaultenabled>no</defaultenabled>
- 	<support_level>core</support_level>
-   </member>
-   <member name="astdb2bdb">
--	<defaultenabled>yes</defaultenabled>
-+	<defaultenabled>no</defaultenabled>
- 	<support_level>core</support_level>
-   </member>
-   <member name="astman">
diff --git a/debian/patches/series b/debian/patches/series
index 2b0c45b..d180777 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,6 +27,6 @@ pjproject
 dahdi_pri_event_removed
 dahdi_create_channels
 
-astdb_remove
+astdb_mans
 hyphen
 reenable

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git