[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.5.3-1-11-gfe59b28

Fathi Boudra fabo at alioth.debian.org
Thu Oct 8 15:21:48 UTC 2009


The following commit has been merged in the experimental-snapshots branch:
commit fe59b2841a7ea3ddcabbab7a0cebaef39715c0ca
Merge: 5109407add0ef7f84573728da9ec33db22da8bfd efc85fd4b72588f336295cc8622e3ff53ab4f60f
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Oct 8 17:22:21 2009 +0200

    Merge branch 'master' into experimental-snapshots
    
    Conflicts:
    	debian/changelog
    	debian/rules

 debian/changelog |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --combined debian/changelog
index 6146b06,480b5f0..efc4a9a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,11 +1,34 @@@
 +qt4-x11 (4:4.6.0~~tp1+git1336+gc5c58c2-0fabo1) experimental-snapshots; urgency=low
 +
 +  * New release from 4.6-stable git branch.
 +  * Refresh qt-copy patches: 0180 and 209.
 +  * Remove qt-copy patches: 0255, 0274, 0280 and 0287.
 +  * Refresh Debian patches: 01, 05, 09, 11, 16, 18, 19, 30, 40, 41, 50 and 81.
 +  * Remove upstream patches:
 +    - 0078-Fix-regressions-in-qeventloop-qtimer-and-qsocketnoti - stolen
 +      upstream.
 +  * Remove Debian patches:
 +    - 14_add_libraries_to_gui_build_where_actually_needed - fixed upstream.
 +  * Update debian/control:
 +    - Remove Brian Nelson from uploaders field.
 +      Thanks for his great work on Qt.
 +    - Drop cdbs build dependency.
 +    - Add libasound2-dev build dependency.
 +    - Add libqt4-multimedia package.
 +  * Update installed files and related lintian files.
 +  * Rewrite debian/rules, converted to dh usage.
 +  * Build with --no-separate-debug-info. Adjust debian/rules accordingly.
 +
 + -- Fathi Boudra <fabo at debian.org>  Sun, 04 Oct 2009 21:53:47 +0200
 +
+ qt4-x11 (4:4.5.3-2) unstable; urgency=low
+ 
+   * Update debian/rules: cleanup make target usage by removing sub-src and
+     sub-tools call. Fix a FTBFS on buildds caused by make target ordering.
+     (Closes: #550127)
+ 
+  -- Fathi Boudra <fabo at debian.org>  Thu, 08 Oct 2009 15:31:52 +0200
+ 
  qt4-x11 (4:4.5.3-1) unstable; urgency=low
  
    * New upstream release:

-- 
Qt 4 Debian packaging



More information about the pkg-kde-commits mailing list