[arch-commits] Commit in qt/repos (9 files)

Pierre Schmitz pierre at archlinux.org
Sat Mar 7 11:14:48 UTC 2009 

    Date: Saturday, March 7, 2009 @ 06:14:47
  Author: pierre
Revision: 29244

Merged revisions 29243 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/qt/trunk

........
  r29243 | pierre | 2009-03-07 12:14:13 +0100 (Sa, 07 M?\195?\164r 2009) | 1 line
  
  upgpkg: qt 4.5.0-2
........

Added:
  qt/repos/testing-x86_64/assistant.desktop
    (from rev 29243, qt/trunk/assistant.desktop)
  qt/repos/testing-x86_64/designer.desktop
    (from rev 29243, qt/trunk/designer.desktop)
  qt/repos/testing-x86_64/linguist.desktop
    (from rev 29243, qt/trunk/linguist.desktop)
  qt/repos/testing-x86_64/qtconfig.desktop
    (from rev 29243, qt/trunk/qtconfig.desktop)
Modified:
  qt/repos/testing-x86_64/	(properties)
  qt/repos/testing-x86_64/PKGBUILD
Deleted:
  qt/repos/testing-x86_64/qt4-assistant.desktop
  qt/repos/testing-x86_64/qt4-designer.desktop
  qt/repos/testing-x86_64/qt4-linguist.desktop

-----------------------+
 PKGBUILD              |   16 +++++++++-------
 assistant.desktop     |    8 ++++++++
 designer.desktop      |    9 +++++++++
 linguist.desktop      |    9 +++++++++
 qt4-assistant.desktop |   10 ----------
 qt4-designer.desktop  |   11 -----------
 qt4-linguist.desktop  |   11 -----------
 qtconfig.desktop      |    8 ++++++++
 8 files changed, 43 insertions(+), 39 deletions(-)


Property changes on: qt/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /qt/trunk:1-29202
   + /qt/trunk:1-29243

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-03-07 11:14:13 UTC (rev 29243)
+++ testing-x86_64/PKGBUILD	2009-03-07 11:14:47 UTC (rev 29244)
@@ -4,7 +4,7 @@
 pkgname=qt
 pkgver=4.5.0
 pkgrel=2
-_qtcopyver=934513
+_qtcopyver=936035
 pkgdesc='A cross-platform application and UI framework'
 arch=('i686' 'x86_64')
 url='http://www.qtsoftware.com/'
@@ -20,13 +20,14 @@
 # svn export -r${_qtcopyver} svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches/ qt-copy-patches-${_qtcopyver}
 source=("ftp://ftp.qtsoftware.com/qt/source/${_pkgfqn}.tar.bz2"
         "ftp://ftp.archlinux.org/other/qt/qt-copy-patches-${_qtcopyver}.tar.bz2"
-        'qt4-assistant.desktop' 'qt4-designer.desktop' 'qt4-linguist.desktop'
+        'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop'
         'qdoc3.patch')
 md5sums=('55e8c74a89e1bc128a5a6f1ff6b8b5ba'
-         'fa08fc4d226e71f125b771e7aeedd190'
-         'c95e1697bf2b923199c3b8cd7d485a17'
-         '00333dca87e24767383217ba378b5980'
-         '71f7ac8206c19da7ecf71cdb391f0452'
+         'c1847bd4ba2240a849dfe34bb5486d26'
+         'b352b4b70faba2571af3fce5d119580a'
+         '491a96682faa03407f768a53cca71db5'
+         'cda7ed7e132689991dc2968a0043b4b0'
+         '717669b728a0a795217d2f52969e454c'
          '868056a3edab09fbac0f82ec8b4a4be3')
 
 build() {
@@ -70,8 +71,9 @@
 	install -D -m644 tools/assistant/tools/assistant/images/assistant.png ${pkgdir}/usr/share/pixmaps/assistant.png
 	install -D -m644 tools/linguist/linguist/images/appicon.png ${pkgdir}/usr/share/pixmaps/linguist.png
 	install -D -m644 tools/designer/src/designer/images/designer.png ${pkgdir}/usr/share/pixmaps/designer.png
+	install -D -m644 src/gui/dialogs/images/qtlogo-64.png ${pkgdir}/usr/share/pixmaps/qtlogo.png
 	install -d ${pkgdir}/usr/share/applications
-	install -m644 ${srcdir}/qt4-{linguist,designer,assistant}.desktop ${pkgdir}/usr/share/applications/
+	install -m644 ${srcdir}/{linguist,designer,assistant,qtconfig}.desktop ${pkgdir}/usr/share/applications/
 
 	# cleanup and path fixes
 	find $pkgdir/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;

Copied: qt/repos/testing-x86_64/assistant.desktop (from rev 29243, qt/trunk/assistant.desktop)
===================================================================
--- testing-x86_64/assistant.desktop	                        (rev 0)
+++ testing-x86_64/assistant.desktop	2009-03-07 11:14:47 UTC (rev 29244)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Exec=/usr/bin/assistant
+Name=Qt Assistant
+GenericName=Qt Document Browser
+Icon=/usr/share/pixmaps/assistant.png
+Terminal=false
+Type=Application
+Categories=Qt;Development;Documentation

Copied: qt/repos/testing-x86_64/designer.desktop (from rev 29243, qt/trunk/designer.desktop)
===================================================================
--- testing-x86_64/designer.desktop	                        (rev 0)
+++ testing-x86_64/designer.desktop	2009-03-07 11:14:47 UTC (rev 29244)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Exec=/usr/bin/designer
+Name=Qt Designer
+GenericName=Interface Designer
+MimeType=application/x-designer
+Icon=/usr/share/pixmaps/designer.png
+Terminal=false
+Type=Application
+Categories=Qt;Development;GUIDesigner

Copied: qt/repos/testing-x86_64/linguist.desktop (from rev 29243, qt/trunk/linguist.desktop)
===================================================================
--- testing-x86_64/linguist.desktop	                        (rev 0)
+++ testing-x86_64/linguist.desktop	2009-03-07 11:14:47 UTC (rev 29244)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Exec=/usr/bin/linguist
+Name=Qt Linguist
+GenericName=Translation Tool
+MimeType=application/x-linguist
+Terminal=false
+Type=Application
+Icon=/usr/share/pixmaps/linguist.png
+Categories=Qt;Development;Translation

Deleted: testing-x86_64/qt4-assistant.desktop
===================================================================
--- testing-x86_64/qt4-assistant.desktop	2009-03-07 11:14:13 UTC (rev 29243)
+++ testing-x86_64/qt4-assistant.desktop	2009-03-07 11:14:47 UTC (rev 29244)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/assistant
-Name=Qt 4 Assistant
-GenericName=Qt4 Document Browser
-X-KDE-StartupNotify=true
-Icon=/usr/share/pixmaps/assistant.png
-Terminal=false
-Type=Application
-Categories=Qt;Development;Documentation

Deleted: testing-x86_64/qt4-designer.desktop
===================================================================
--- testing-x86_64/qt4-designer.desktop	2009-03-07 11:14:13 UTC (rev 29243)
+++ testing-x86_64/qt4-designer.desktop	2009-03-07 11:14:47 UTC (rev 29244)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/designer
-Name=Qt 4 Designer
-GenericName=Interface Designer
-X-KDE-StartupNotify=true
-MimeType=application/x-designer
-Icon=/usr/share/pixmaps/designer.png
-Terminal=false
-Type=Application
-Categories=Qt;Development;GUIDesigner

Deleted: testing-x86_64/qt4-linguist.desktop
===================================================================
--- testing-x86_64/qt4-linguist.desktop	2009-03-07 11:14:13 UTC (rev 29243)
+++ testing-x86_64/qt4-linguist.desktop	2009-03-07 11:14:47 UTC (rev 29244)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/linguist
-Name=Qt 4 Linguist
-GenericName=Translation Tool
-X-KDE-StartupNotify=true
-MimeType=application/x-linguist
-Terminal=false
-Type=Application
-Icon=/usr/share/pixmaps/linguist.png
-Categories=Qt;Development;Translation

Copied: qt/repos/testing-x86_64/qtconfig.desktop (from rev 29243, qt/trunk/qtconfig.desktop)
===================================================================
--- testing-x86_64/qtconfig.desktop	                        (rev 0)
+++ testing-x86_64/qtconfig.desktop	2009-03-07 11:14:47 UTC (rev 29244)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Qt Config 
+Comment=Configure Qt behavior, styles, fonts
+Exec=/usr/bin/qtconfig
+Icon=/usr/share/pixmaps/qtlogo
+Terminal=false
+Type=Application
+Categories=Qt;Settings;

More information about the arch-commits mailing list