On Tue, Sep 21, 2010 at 17:22, Fathi Boudra <[email protected]> wrote: > Hi, > I have made the following changes to qt in project Trunk:Testing. Please > review and accept ASAP. > > Thank You, > Fathi Boudra > > [This message was auto-generated] > > --- > > Request #7660: > > submit: devel:qt-mtf/qt(r73) -> Trunk:Testing/qt > > > Message: > * Mon Sep 20 2010 Fathi Boudra <[email protected]> - 4.7.0 > - Update to 4.7.0 > - Remove patches. > 12_fix_qstatictext_with_opengl1_engine.patch - stolen upstream > 14_add_three_new_style-hints_to_qfont.patch - stolen upstream > 15_fix_qstatictext_copy_constructor.patch - stolen upstream > > State: new 2010-09-21T07:19:42 boudra > Comment: None >
Fathi, what about bug IDs in changelogs ? > > changes files: > -------------- > --- qt.changes > +++ qt.changes > @@ -0,0 +1,7 @@ > +* Mon Sep 20 2010 Fathi Boudra <[email protected]> - 4.7.0 > +- Update to 4.7.0 > +- Remove patches. > + 12_fix_qstatictext_with_opengl1_engine.patch - stolen upstream > + 14_add_three_new_style-hints_to_qfont.patch - stolen upstream > + 15_fix_qstatictext_copy_constructor.patch - stolen upstream > + > > old: > ---- > 12_fix_qstatictext_with_opengl1_engine.patch > 14_add_three_new_style-hints_to_qfont.patch > 15_fix_qstatictext_copy_constructor.patch > qt-everywhere-opensource-src-4.7.0-rc1.tar.gz > > new: > ---- > qt-everywhere-opensource-src-4.7.0.tar.gz > > spec files: > ----------- > --- qt.spec > +++ qt.spec > @@ -1,8 +1,8 @@ > -# spec file for package qt (Version 4.7.0 rc 1) > +# spec file for package qt (Version 4.7.0) > > %define upstream_short_version 4.7.0 > -%define upstream_extra_version rc1 > -%define upstream_version %{upstream_short_version}-%{upstream_extra_version} > +#%define upstream_extra_version rc1 > +%define upstream_version %{upstream_short_version} > > %ifarch %{arm} > %define opengl_arg es2 > @@ -21,7 +21,7 @@ > %endif > > Name: qt > -Version: %{upstream_short_version}~%{upstream_extra_version} > +Version: %{upstream_short_version} > Release: 1 > License: LGPLv2.1 with exception or GPLv3 > Summary: Cross-platform application and UI framework > @@ -49,11 +49,8 @@ > Patch8: 09_texture_enable_fix.patch > Patch9: 10_webkit_self_injection_into_qt_configuration.patch > Patch10: 11_honor_all_FreeDesktop_icon_paths.patch > -Patch11: 12_fix_qstatictext_with_opengl1_engine.patch > -Patch12: 13_connman_backend_for_bearer_management.patch.bz2 > -Patch13: 14_add_three_new_style-hints_to_qfont.patch > -Patch14: 15_fix_qstatictext_copy_constructor.patch > -Patch15: 16_force_cxxflags_on_arm.patch > +Patch11: 13_connman_backend_for_bearer_management.patch.bz2 > +Patch12: 16_force_cxxflags_on_arm.patch > BuildRequires: cups-devel > BuildRequires: fdupes > BuildRequires: flex > @@ -559,17 +556,11 @@ > %patch9 -p1 > # 11_honor_all_FreeDesktop_icon_paths.patch > %patch10 -p1 > -# 12_fix_qstatictext_with_opengl1_engine.patch > -%patch11 -p1 > # 13_connman_backend_for_bearer_management.patch.bz2 > -%patch12 -p1 > -# 14_add_three_new_style-hints_to_qfont.patch > -%patch13 -p1 > -# 15_fix_qstatictext_copy_constructor.patch > -%patch14 -p1 > +%patch11 -p1 > %ifarch armv7l > # 16_force_cxxflags_on_arm.patch > -%patch15 -p1 > +%patch12 -p1 > %endif > > %build > > other changes: > -------------- > > ++++++ qt-everywhere-opensource-src-4.7.0-rc1.tar.gz -> > qt-everywhere-opensource-src-4.7.0.tar.gz > 1005853 lines of diff (skipped) > > ++++++ deleted files: > --- 12_fix_qstatictext_with_opengl1_engine.patch > --- 14_add_three_new_style-hints_to_qfont.patch > --- 15_fix_qstatictext_copy_constructor.patch > > _______________________________________________ > Meego-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits > -- br, Alexander Kanevskiy _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
