[sr-dev] git:4.1: pkg/kamailio/deb: merge changes from Debian

Victor Seva linuxmaniac at torreviejawireless.org
Tue Jan 28 07:58:18 CET 2014


Module: sip-router
Branch: 4.1
Commit: 5d83b84e5efbed81ebdf95ebb0d7653b1668af0b
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d83b84e5efbed81ebdf95ebb0d7653b1668af0b

Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Committer: Victor Seva <linuxmaniac at torreviejawireless.org>
Date:   Mon Dec 16 09:04:15 2013 +0100

pkg/kamailio/deb: merge changes from Debian

(cherry picked from commit 09b7a15e24800a5617695722a43d92b6fedfd77f)

Conflicts:
	pkg/kamailio/deb/squeeze/changelog

---

 pkg/kamailio/deb/debian/compat                     |    2 +-
 pkg/kamailio/deb/debian/control                    |  654 ++++++++++----------
 pkg/kamailio/deb/debian/kamailio-berkeley-bin.dirs |    1 +
 pkg/kamailio/deb/debian/kamailio.README.Debian     |    7 +-
 pkg/kamailio/deb/debian/kamailio.default           |   26 +-
 pkg/kamailio/deb/debian/kamailio.init              |  279 +++------
 pkg/kamailio/deb/debian/kamailio.postinst          |   28 +-
 pkg/kamailio/deb/debian/rules                      |  139 ++---
 pkg/kamailio/deb/debian/source/format              |    1 +
 pkg/kamailio/deb/debian/watch                      |    3 +
 pkg/kamailio/deb/jessie/compat                     |    2 +-
 pkg/kamailio/deb/jessie/control                    |  654 ++++++++++----------
 pkg/kamailio/deb/jessie/kamailio-berkeley-bin.dirs |    1 +
 pkg/kamailio/deb/jessie/kamailio.README.Debian     |    7 +-
 pkg/kamailio/deb/jessie/kamailio.default           |   26 +-
 pkg/kamailio/deb/jessie/kamailio.init              |  279 +++------
 pkg/kamailio/deb/jessie/kamailio.postinst          |   28 +-
 pkg/kamailio/deb/jessie/rules                      |  139 ++---
 pkg/kamailio/deb/jessie/source/format              |    1 +
 pkg/kamailio/deb/jessie/watch                      |    3 +
 pkg/kamailio/deb/squeeze/compat                    |    2 +-
 pkg/kamailio/deb/squeeze/control                   |  480 +++++++--------
 .../deb/squeeze/kamailio-berkeley-bin.dirs         |    1 +
 pkg/kamailio/deb/squeeze/kamailio.README.Debian    |    7 +-
 pkg/kamailio/deb/squeeze/kamailio.default          |   26 +-
 pkg/kamailio/deb/squeeze/kamailio.init             |  279 +++------
 pkg/kamailio/deb/squeeze/kamailio.postinst         |   28 +-
 pkg/kamailio/deb/squeeze/rules                     |  129 ++---
 pkg/kamailio/deb/squeeze/source/format             |    1 +
 pkg/kamailio/deb/squeeze/watch                     |    3 +
 pkg/kamailio/deb/wheezy/compat                     |    2 +-
 pkg/kamailio/deb/wheezy/control                    |  615 ++++++++++---------
 pkg/kamailio/deb/wheezy/kamailio-berkeley-bin.dirs |    1 +
 pkg/kamailio/deb/wheezy/kamailio.README.Debian     |    7 +-
 pkg/kamailio/deb/wheezy/kamailio.default           |   26 +-
 pkg/kamailio/deb/wheezy/kamailio.init              |  279 +++------
 pkg/kamailio/deb/wheezy/kamailio.postinst          |   28 +-
 pkg/kamailio/deb/wheezy/rules                      |  139 ++---
 pkg/kamailio/deb/wheezy/source/format              |    1 +
 pkg/kamailio/deb/wheezy/watch                      |    3 +
 40 files changed, 1869 insertions(+), 2468 deletions(-)

Diff:   http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5d83b84e5efbed81ebdf95ebb0d7653b1668af0b



More information about the sr-dev mailing list