[SCM] crtmpserver/master: Merge branch 'wheezy'

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c0684315cff64ea33f7b7681b151195b9556ed5b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 4 12:15:33 2011 +0200

    Merge branch 'wheezy'
    
    Also set upload target to UNRELEASED, as Andriy mentioned that the
    package was not ready for upload yet.

diff --git a/debian/changelog b/debian/changelog
index 2001d11..12d651d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
-crtmpserver (0.0~dfsg+svn611-1) unstable; urgency=low
+crtmpserver (0.0~dfsg+svn611-1) UNRELEASED; urgency=low
 
   [ Andriy Beregovenko ]
   * New upstream version
-  * Fixed search of libraries in cmake rules (Closes: #642707)
   * Split package to libs apps dev and main daemon
 
  -- Andriy Beregovenko <jet at jet.kiev.ua>  Sat, 01 Oct 2011 23:13:48 +0300
 
+crtmpserver (0.0~dfsg+svn474-2) unstable; urgency=low
+
+  * Team upload.
+  * Fixed search of libraries in cmake rules (Closes: #642707)
+    Thanks to Andriy Beregovenko <jet at jet.kiev.ua> for providing the patch
+
+ -- Reinhard Tartler <siretart at tauware.de>  Mon, 03 Oct 2011 13:20:07 +0200
+
 crtmpserver (0.0~dfsg+svn474-1) unstable; urgency=low
 
   [ Andriy Beregovenko ]

-- 
crtmpserver packaging