[SCM] crtmpserver/master: Merge changelog entry 0.0~dfsg+svn611-1 to 0.0~dfsg+svn611.1-1. Changelog has been altered.

[jet-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 99944c053a388e737ea7aa7fd87c9c7d6b231983
Author: Andriy Beregovenko <jet at jet.kiev.ua>
Date:   Sun Nov 20 00:49:06 2011 +0200

    Merge changelog entry 0.0~dfsg+svn611-1 to 0.0~dfsg+svn611.1-1. Changelog has been altered.

diff --git a/debian/changelog b/debian/changelog
index 2cc0c35..17ba940 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,14 @@
-crtmpserver (0.0~dfsg+svn611.1-1) unstable; urgency=low
-
-  [ Reinhard Tartler ]
-  * Refresh patches.
-
-  [ Andriy Beregovenko ]
-  * Add rc script
-  * Add basic Lua configuration scripts
-  * Add application configuration scripts(per application)
-  * Reimported Upstream version 0.0~dfsg+svn611
-
- -- Andriy Beregovenko <jet at jet.kiev.ua>  Mon, 14 Nov 2011 14:27:26 +0200
-
-crtmpserver (0.0~dfsg+svn611-1) UNRELEASED; urgency=low
+crtmpserver (0.0~dfsg+svn611.1-1) UNRELEASED; urgency=low
 
   [ Andriy Beregovenko ]
   * New upstream version
-  * Split package to libs apps dev and main daemon
+  * Split package to four packages: crtmpserver-libs, crtmpserver-apps,
+    crtmpserver-dev, crtmpserver
+  * Add RC script and defaults file for it
+  * A new configuration system, serving the configuration of the server.
+    The system is based on the original configuration file that is divided 
+    into parts (by applications and features). Read README.Debian for more
+    information
 
  -- Andriy Beregovenko <jet at jet.kiev.ua>  Sat, 01 Oct 2011 23:13:48 +0300
 

-- 
crtmpserver packaging