[Pkg-voip-commits] [asterisk] 03/03: start work on asterisk 11.7.0

[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 bbb82e1054e0f554255691bafc2cba20304209ee
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Wed Dec 18 08:21:27 2013 +0100

    start work on asterisk 11.7.0
---
 debian/changelog          |   8 ++--
 debian/patches/astdb_mans | 103 ----------------------------------------------
 debian/patches/series     |   1 -
 3 files changed, 3 insertions(+), 109 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4e4c8e..cc35f91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,10 @@
-asterisk (1:11.6.1~dfsg-1) UNRELEASED; urgency=high
+asterisk (1:11.7.0~dfsg-1) UNRELEASED; urgency=high
 
-  [ Tzafrir Cohen ]
   * New upstream security release (Closes: #732355).
-
-  [ Jeremy Lainé ]
+    - Drop astdb_mans patch, fixed upstream.
   * Fix versioned Breaks/Replaces for asterisk-dahdi (Closes: #732419).
 
- -- Tzafrir Cohen <tzafrir at debian.org>  Tue, 17 Dec 2013 19:42:09 +0200
+ -- Jeremy Lainé <jeremy.laine at m4x.org>  Wed, 18 Dec 2013 08:17:27 +0100
 
 asterisk (1:11.6.0~dfsg-3) unstable; urgency=medium
 
diff --git a/debian/patches/astdb_mans b/debian/patches/astdb_mans
deleted file mode 100644
index 0157113..0000000
--- a/debian/patches/astdb_mans
+++ /dev/null
@@ -1,103 +0,0 @@
-Description: Man pages for astdb2*
-Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
---- a/Makefile
-+++ b/Makefile
-@@ -564,6 +564,7 @@ bininstall: _all installdirs $(SUBDIRS_I
- 	$(INSTALL) -m 644 doc/core-*.xml "$(DESTDIR)$(ASTDATADIR)/documentation"
- 	$(INSTALL) -m 644 doc/appdocsxml.dtd "$(DESTDIR)$(ASTDATADIR)/documentation"
- 	$(INSTALL) -m 644 doc/asterisk.8 "$(DESTDIR)$(ASTMANDIR)/man8"
-+	$(INSTALL) -m 644 doc/astdb*.8 "$(DESTDIR)$(ASTMANDIR)/man8"
- 	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 "$(DESTDIR)$(ASTMANDIR)/man8"
- 	$(INSTALL) -m 644 contrib/scripts/autosupport.8 "$(DESTDIR)$(ASTMANDIR)/man8"
- 	$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 "$(DESTDIR)$(ASTMANDIR)/man8"
---- /dev/null
-+++ b/doc/astdb2bdb.8
-@@ -0,0 +1,46 @@
-+.TH "ASTDB2BDB" "8" "30 SEPTEMBER 2013" "Asterisk 11" ""
-+
-+.SH NAME
-+astdb2bdb \- convert astdb back to Berkeley DB 1.86
-+.SH SYNOPSIS
-+
-+.B cd $astlibdir && astdb2bdb path/to/astdb.sqlite3
-+
-+.SH "DESCRIPTION"
-+Up until version version 11, Asterisk used and old version of the
-+Berkeley DB 1.86 (bdb) to store its internal persistent database. In
-+version 11 it switched to using a SQLIte 3 database. This program is
-+used to convert the newly-formatted SQLite 3 astdb back to bdb.
-+
-+You may need it in case of reverting an upgrade or other similar
-+scenarios.
-+
-+.SH OPTIONS
-+There is a single (and required) parameter: the path the the sqlite file.
-+The output file will be a file called
-+.B astdb
-+in the current working directory.
-+
-+.SH EXAMPLES
-+In case you want to revert an upgrade to Asterisk 11, you can do the
-+following (while Asterisk is not running):
-+
-+  cd /var/lib/asterisk && astdb2bdb astdb.sqlite3 && rm astdb.sqlite3
-+
-+This will convert the newly-formatted astdb back to the old format, and
-+delete it (to avoid obsolete data copies).
-+
-+.SH NOTES
-+Berkeley DB 1.86 is obsolete. It is incompatible with newer versions
-+(4.x and newer) that you may see around. Chances are you don't have the
-+tools to use it independently of Asterisk.
-+
-+.SH SEE ALSO
-+.B astdb2sqlite3(8),
-+.B asterisk(8)
-+
-+.SH AUTHOR
-+astdb2bdb was written by Terry Wilson <twilson at digium.com>.
-+
-+This manual page was written by Tzafrir Cohen <tzafrir.cohen at xorcom.com>.
-+
---- /dev/null
-+++ b/doc/astdb2sqlite3.8
-@@ -0,0 +1,39 @@
-+.TH "ASTDB2SQLITE3" "8" "30 SEPTEMBER 2013" "Asterisk 11" ""
-+
-+.SH NAME
-+astdb2sqlite3 \- convert astdb to SQLite 3
-+.SH SYNOPSIS
-+
-+.B astdb2sqlite3 path/to/astdb
-+
-+.SH "DESCRIPTION"
-+Up until version version 11, Asterisk used and old version of the
-+Berkeley DB 1.86 (bdb) to store its internal persistent database. In
-+version 11 it switched to using a SQLIte 3 database. This program is
-+used to convert an existing bdb astdb file to astdb.sqlite3.
-+
-+Normally the conversion is done by Asterisk itself which will run this
-+program. But you may need to run it on your own.
-+
-+.SH OPTIONS
-+There is a single (and required) parameter: the path the the bdb file.
-+The output file will be the same as the input, with
-+.B .sqlite3
-+appended.
-+
-+.SH EXAMPLES
-+Asterisk will typically run the following to upgrade the database:
-+
-+  astdb2sqlite3 /var/lib/asterisk/astdb
-+
-+which will create \fB/var/lib/asterisk/astdb.sqlite3\fR.
-+
-+.SH SEE ALSO
-+.B astdb2bdb(8),
-+.B asterisk(8)
-+
-+.SH AUTHOR
-+astdb2sqlite3 was written by Terry Wilson <twilson at digium.com>.
-+
-+This manual page was written by Tzafrir Cohen <tzafrir.cohen at xorcom.com>.
-+
diff --git a/debian/patches/series b/debian/patches/series
index d4726f3..5f9376c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,7 +27,6 @@ pjproject
 dahdi_pri_event_removed
 dahdi_create_channels
 
-astdb_mans
 hyphen
 reenable
 freeradius-client

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