From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 31 Oct 2011 12:30:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'maniacikarus/samba'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1fa1b26fdbd4e471e6a717a3c2cf014ce5cbcee;p=ipfire-3.x.git

Merge remote-tracking branch 'maniacikarus/samba'

Conflicts:
	samba/samba.nm
---

c1fa1b26fdbd4e471e6a717a3c2cf014ce5cbcee
diff --cc samba/samba.nm
index e50b083c1,9b8f8be37..e0f553788
--- a/samba/samba.nm
+++ b/samba/samba.nm
@@@ -88,16 -85,14 +88,14 @@@ en
  
  packages
  	package %{name}
--	end
--	
++
  	package %{name}-libs
  		template LIBS
  	end
--	
++
  	package %{name}-devel
  		template DEVEL
 +
 +		requires += %{name}-libs=%{thisver}
  	end
  end
--