git failed to do fast forward and rebase to avoid the merge notification

Merge branch 'master' of ssh://git.sip-router.org/kamailio

* 'master' of ssh://git.sip-router.org/kamailio:
  Rollback accidental changes from commit (74f53b7d7f6ff00144152aff453e6b388447320c)
  pkg/kamailio/deb: update to 4.2.0~pre0

Makefile.groups

@@ -351,9 +351,6 @@ module_group_ksctp=$(mod_list_sctp)
 # pkg auth_ephemeral module
 module_group_kautheph=$(mod_list_autheph)
 
-# pkg db_cassandra module
-module_group_kcassandra=$(mod_list_cassandra)
-
 # pkg gzcompress module
 module_group_kgzcompress=$(mod_list_gzcompress)
 

pkg/kamailio/deb/debian/changelog

@@ -1,3 +1,9 @@
+kamailio (4.2.0~pre0) UNRELEASED; urgency=medium
+
+  * update version to 4.2.0~pre0
+
+ -- Victor Seva <[email protected]>  Fri, 12 Sep 2014 02:38:24 +0200
+
 kamailio (4.2.0~dev9) unstable; urgency=medium
 
   * update version to 4.2.0~dev9

pkg/kamailio/deb/jessie/changelog

@@ -1,3 +1,9 @@
+kamailio (4.2.0~pre0) UNRELEASED; urgency=medium
+
+  * update version to 4.2.0~pre0
+
+ -- Victor Seva <[email protected]>  Fri, 12 Sep 2014 02:38:24 +0200
+
 kamailio (4.2.0~dev9) unstable; urgency=medium
 
   * update version to 4.2.0~dev9

pkg/kamailio/deb/precise/changelog

@@ -1,3 +1,9 @@
+kamailio (4.2.0~pre0) UNRELEASED; urgency=medium
+
+  * update version to 4.2.0~pre0
+
+ -- Victor Seva <[email protected]>  Fri, 12 Sep 2014 02:38:24 +0200
+
 kamailio (4.2.0~dev9) unstable; urgency=medium
 
   * update version to 4.2.0~dev9

pkg/kamailio/deb/squeeze/changelog

@@ -1,3 +1,9 @@
+kamailio (4.2.0~pre0) UNRELEASED; urgency=medium
+
+  * update version to 4.2.0~pre0
+
+ -- Victor Seva <[email protected]>  Fri, 12 Sep 2014 02:38:24 +0200
+
 kamailio (4.2.0~dev9) unstable; urgency=medium
 
   * update version to 4.2.0~dev9

pkg/kamailio/deb/trusty/changelog

@@ -1,3 +1,9 @@
+kamailio (4.2.0~pre0) UNRELEASED; urgency=medium
+
+  * update version to 4.2.0~pre0
+
+ -- Victor Seva <[email protected]>  Fri, 12 Sep 2014 02:38:24 +0200
+
 kamailio (4.2.0~dev9) unstable; urgency=medium
 
   * update version to 4.2.0~dev9

pkg/kamailio/deb/wheezy/changelog

@@ -1,3 +1,9 @@
+kamailio (4.2.0~pre0) UNRELEASED; urgency=medium
+
+  * update version to 4.2.0~pre0
+
+ -- Victor Seva <[email protected]>  Fri, 12 Sep 2014 02:38:24 +0200
+
 kamailio (4.2.0~dev9) unstable; urgency=medium
 
   * update version to 4.2.0~dev9

pkg/kamailio/deb/wheezy/control

@@ -43,9 +43,7 @@ Build-Depends: bison,
                unixodbc-dev,
                uuid-dev,
                xsltproc,
-               zlib1g-dev,
-               libthrift-dev,
-               libboost-dev
+               zlib1g-dev
 Standards-Version: 3.9.5
 Homepage: http://www.kamailio.org/
 Vcs-git: git://anonscm.debian.org/pkg-voip/kamailio.git
@@ -545,45 +543,3 @@ Depends: binutils,
 Description: Kamailio - package for "nice to have" installation
  This is a metapackage for easy installation various useful tools that may be
  handy on server with Kamailio installed.
-
-Package: kamailio-ims-modules
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-Description: Kamailio - IMS Modules
- Kamailio is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, Kamailio can handle thousands calls
- per second even on low-budget hardware.
- .
- This package contains various Diameter interfaces and modules for Kamailio
- to run as an IMS core.
-
-Package: kamailio-outbound-modules
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-Description: Kamailio - Outbound Module
- Kamailio is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, Kamailio can handle thousands calls
- per second even on low-budget hardware.
- .
- This package contains the module implementing SIP outbound extension.
-
-Package: kamailio-websocket-modules
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-Description: Kamailio - Websocket Module
- Kamailio is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, Kamailio can handle thousands calls
- per second even on low-budget hardware.
- .
- This package contains the module implementing WebSocket transport layer.
-
-Package: kamailio-cassandra-modules
-Architecture: any
-Depends: ${shlibs:Depends}, kamailio (= ${binary:Version})
-Description: Kamailio - Cassandra Module
- Kamailio is a very fast and flexible SIP (RFC3261)
- proxy server. Written entirely in C, Kamailio can handle thousands calls
- per second even on low-budget hardware.
- .
- This package contains the modules for using cassandra as a database backend.
-

pkg/kamailio/deb/wheezy/rules

@@ -38,7 +38,7 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \
 			   ldap xml perl utils lua memcached \
 			   snmpstats carrierroute xmpp cpl redis python geoip\
 			   sqlite json mono ims sctp java \
-			   tls outbound websocket autheph cassandra
+			   tls outbound websocket autheph 
 
 # module groups to be packaged onto kamailio-extra-modules
 EXTRA_GROUPS=gzcompress uuid ev
@@ -217,3 +217,4 @@ get-orig-source:
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
 
+