[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Please unblock smarty - RC bug fix



http://incoming.debian.org/smarty_2.6.20-1.1_amd64.changes

$ debdiff smarty_2.6.20-1.dsc smarty_2.6.20-1.1.dsc
diff -u smarty-2.6.20/debian/Makefile smarty-2.6.20/debian/Makefile
--- smarty-2.6.20/debian/Makefile
+++ smarty-2.6.20/debian/Makefile
@@ -25,3 +25,3 @@
 	cp -r demo $(DOCPATH)
-	cp -r misc $(DOCPATH)
+	cp misc/smarty_icon.README $(DOCPATH)
 	cp -r unit_test $(DOCPATH)
diff -u smarty-2.6.20/debian/changelog smarty-2.6.20/debian/changelog
--- smarty-2.6.20/debian/changelog
+++ smarty-2.6.20/debian/changelog
@@ -1,3 +1,10 @@
+smarty (2.6.20-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove non-free smarty logo included in package (Closes: #507316)
+
+ -- Neil Williams <codehelp@debian.org>  Sun, 14 Dec 2008 09:52:16
+0000 +
 smarty (2.6.20-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- smarty-2.6.20.orig/debian/NEWS
+++ smarty-2.6.20/debian/NEWS
@@ -0,0 +1,14 @@
+smarty (2.6.20-1.1) unstable; urgency=low
+
+  The smarty logo is trademarked and has been removed. Before
+  including the smarty logo in your own website(s), ensure you
+  read http://www.smarty.net/copyright.php and abide by the
+  logo licence, in particular the restrictions on modifying
+  the real or apparent size of the image, prevention of use
+  in screenshots and the requirement for "empty space" around
+  the logo. See #507316 for more information. The upstream
+  README relating to the smarty icon is retained, although
+  the content is misleading - the icon isn't completely free
+  to use.  
+
+ -- Neil Williams <codehelp@debian.org>  Sun, 14 Dec 2008 10:13:50
+0000

$ debdiff smarty_2.6.20-1_amd64.changes smarty_2.6.20-1.1_amd64.changes 
[The following lists of changes regard files as different if they have
different names, permissions or owners.]

Files in second .changes but not in first
-----------------------------------------
-rw-r--r--  root/root   /usr/share/doc/smarty/NEWS.Debian.gz
-rw-r--r--  root/root   /usr/share/doc/smarty/smarty_icon.README

Files in first .changes but not in second
-----------------------------------------
-rw-r--r--  root/root   /usr/share/doc/smarty/misc/smarty_icon.README
-rw-r--r--  root/root   /usr/share/doc/smarty/misc/smarty_icon.gif

Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-828-] {+824+}
Version: [-2.6.20-1-] {+2.6.20-1.1+}

Thanks.

-- 


Neil Williams
=============
http://www.data-freedom.org/
http://www.nosoftwarepatents.com/
http://www.linux.codehelp.co.uk/

Attachment: pgp5iRVePetiV.pgp
Description: PGP signature


Reply to: