[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

Fathi Boudra fabo at alioth.debian.org
Sat Jun 11 11:43:01 UTC 2011


The following commit has been merged in the experimental-snapshots branch:
commit c28782575ef1482aec7c72f578977b8bc3dde676
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun May 8 19:13:21 2011 +0300

    Revert "Pass -openssl-linked configure option."
    
    This reverts commit a6a2fbbce5c8e8c11b0847b0290d30698a2c25dd.
---
 debian/changelog |    1 -
 debian/rules     |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 014dcd9..25f1c77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,6 @@ qt4-x11 (4:4.7.3-1) UNRELEASED; urgency=low
     - Make_use_of_the_fast_image_paths.patch
     - Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
     - Prevent_recursion_when_creating_window_surface.patch
-  * Update debian/rules: pass -openssl-linked configure option.
 
   [ Pino Toscano ]
   * Build depend on libssl-dev. (Closes: #623596)
diff --git a/debian/rules b/debian/rules
index c209b66..986ac81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,7 +117,6 @@ endif
 	            -system-libtiff \
 	            -system-libpng \
 	            -system-libjpeg \
-	            -openssl-linked \
 	            -no-rpath \
 	            -optimized-qmake \
 	            -dbus-linked \

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list