r46843 - in /packages/texmaker/trunk/debian: changelog copyright

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

Author: jump-guest
Date: Tue Aug  5 21:13:39 2014
New Revision: 46843

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46843
Log:
New upstream release

Modified:
    packages/texmaker/trunk/debian/changelog
    packages/texmaker/trunk/debian/copyright

Modified: packages/texmaker/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/changelog?rev=46843&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/changelog	(original)
+++ packages/texmaker/trunk/debian/changelog	Tue Aug  5 21:13:39 2014
@@ -1,3 +1,10 @@
+texmaker (4.3-1) unstable; urgency=medium
+
+  * New upstream release.
+  * d/copyright, Add missing diff/* copyright.
+
+ -- Julián Moreno Patiño <julian at debian.org>  Tue, 05 Aug 2014 07:13:00 -0500
+
 texmaker (4.2-2) unstable; urgency=medium
 
   * Use synctex parser provided by libsynctex-dev. (Closes: #753812)

Modified: packages/texmaker/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/copyright?rev=46843&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/copyright	(original)
+++ packages/texmaker/trunk/debian/copyright	Tue Aug  5 21:13:39 2014
@@ -107,6 +107,29 @@
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Files: diff/*
+Copyright: 2007-2011 Chas Emerick <cemerick at snowtide.com>
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+   1. Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY Chas Emerick ``AS IS'' AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL Chas Emerick OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Files: manhattanstyle.* styleanimator.* stylehelper.* minisplitter.*
 Copyright: 2009 Nokia Corporation and/or its subsidiary(-ies).
  2012 Digia Plc and/or its subsidiary(-ies)