[SCM] Qt 4 packaging branch, master, updated. debian/4.8.2-2-4-ge940bf4

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=e940bf4

The following commit has been merged in the master branch:
commit e940bf45c17c8399d1f5279a60c09f181fe4d07e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Aug 18 15:25:49 2012 -0300

    Add a note on README.source about the removal of the RFCs.
---
 debian/README.source |    6 ++++++
 debian/changelog     |    2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index b8a2d79..aff005d 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,3 +1,9 @@
+DFSG-repackaging
+----------------
+
+The source code of Qt is repackaged to get rid of the non-DFSG compliant
+RFCs that are bundled with zlib's source code inside src/3rdparty/zlib/doc/.
+
 Patches to the original source code
 -----------------------------------
 
diff --git a/debian/changelog b/debian/changelog
index 9770152..75a72c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ qt4-x11 (4:4.8.2+dfsg-1) UNRELEASED; urgency=low
   * Add myself to Uploaders.
   * Remove non-free zlib's RFCs (Closes: #685132):
     - Add prune-nonfree to debian/rules to remove them.
+    - Add a note on README.source of what we are removing from the original
+      tarball.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Aug 2012 15:14:31 -0300
 

-- 
Qt 4 packaging