[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=18e7e7c

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

    Add a target to remove zlib's non-free RFCs.
---
 debian/changelog |    2 ++
 debian/rules     |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8feb8ca..9770152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qt4-x11 (4:4.8.2+dfsg-1) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add myself to Uploaders.
+  * Remove non-free zlib's RFCs (Closes: #685132):
+    - Add prune-nonfree to debian/rules to remove them.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Aug 2012 15:14:31 -0300
 
diff --git a/debian/rules b/debian/rules
index 0e1aded..1335dd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -372,4 +372,8 @@ override_dh_builddeb:
 	dh_builddeb $(addprefix -p,$(pkgs_compress_xz)) -- -Zxz
 	dh_builddeb --remaining-packages
 
+prune-nonfree:
+	# Delete zlib's RFCs.
+	find \( -name rfc195* \) -print -delete
+
 .PHONY: override_dh_auto_test

-- 
Qt 4 packaging