[arch-commits] Commit in qt4/trunk (9 files)

Andrea Scarpino andrea at nymeria.archlinux.org
Fri Mar 15 07:32:33 UTC 2013


    Date: Friday, March 15, 2013 @ 08:32:33
  Author: andrea
Revision: 180053

Fix conflicts

Added:
  qt4/trunk/assistant-qt4.desktop
  qt4/trunk/designer-qt4.desktop
  qt4/trunk/linguist-qt4.desktop
  qt4/trunk/qtconfig-qt4.desktop
Modified:
  qt4/trunk/PKGBUILD
Deleted:
  qt4/trunk/assistant.desktop
  qt4/trunk/designer.desktop
  qt4/trunk/linguist.desktop
  qt4/trunk/qtconfig.desktop

-----------------------+
 PKGBUILD              |    6 +++---
 assistant-qt4.desktop |    9 +++++++++
 assistant.desktop     |    9 ---------
 designer-qt4.desktop  |   11 +++++++++++
 designer.desktop      |   11 -----------
 linguist-qt4.desktop  |   10 ++++++++++
 linguist.desktop      |   10 ----------
 qtconfig-qt4.desktop  |    9 +++++++++
 qtconfig.desktop      |    9 ---------
 9 files changed, 42 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-15 06:27:33 UTC (rev 180052)
+++ PKGBUILD	2013-03-15 07:32:33 UTC (rev 180053)
@@ -4,7 +4,7 @@
 
 pkgname=qt4
 pkgver=4.8.4
-pkgrel=14
+pkgrel=15
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -28,7 +28,7 @@
 conflicts=('qt')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz"
-        'qtconfig.desktop' 'assistant.desktop' 'designer.desktop' 'linguist.desktop'
+        'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop'
         'improve-cups-support.patch')
 md5sums=('89c5ecba180cae74c66260ac732dc5cb'
          'a16638f4781e56e7887ff8212a322ecc'
@@ -89,7 +89,7 @@
     install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
       "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png"
     install -d "${pkgdir}"/usr/share/applications
-    install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig}.desktop \
+    install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig}-qt4.desktop \
       "${pkgdir}/usr/share/applications/"
 
     # Useful symlinks for cmake and configure scripts

Added: assistant-qt4.desktop
===================================================================
--- assistant-qt4.desktop	                        (rev 0)
+++ assistant-qt4.desktop	2013-03-15 07:32:33 UTC (rev 180053)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt4 Assistant 
+Comment=Shows Qt4 documentation and examples
+Exec=assistant-qt4
+Icon=assistant
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Documentation;

Deleted: assistant.desktop
===================================================================
--- assistant.desktop	2013-03-15 06:27:33 UTC (rev 180052)
+++ assistant.desktop	2013-03-15 07:32:33 UTC (rev 180053)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt4 Assistant 
-Comment=Shows Qt4 documentation and examples
-Exec=assistant-qt4
-Icon=assistant
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;

Added: designer-qt4.desktop
===================================================================
--- designer-qt4.desktop	                        (rev 0)
+++ designer-qt4.desktop	2013-03-15 07:32:33 UTC (rev 180053)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Qt4 Designer
+GenericName=Interface Designer
+Comment=Design GUIs for Qt4 applications
+Exec=designer-qt4
+Icon=designer
+MimeType=application/x-designer;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;

Deleted: designer.desktop
===================================================================
--- designer.desktop	2013-03-15 06:27:33 UTC (rev 180052)
+++ designer.desktop	2013-03-15 07:32:33 UTC (rev 180053)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Qt4 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt4 applications
-Exec=designer-qt4
-Icon=designer
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;

Added: linguist-qt4.desktop
===================================================================
--- linguist-qt4.desktop	                        (rev 0)
+++ linguist-qt4.desktop	2013-03-15 07:32:33 UTC (rev 180053)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt4 Linguist 
+Comment=Add translations to Qt4 applications
+Exec=linguist-qt4
+Icon=linguist
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;

Deleted: linguist.desktop
===================================================================
--- linguist.desktop	2013-03-15 06:27:33 UTC (rev 180052)
+++ linguist.desktop	2013-03-15 07:32:33 UTC (rev 180053)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt4 Linguist 
-Comment=Add translations to Qt4 applications
-Exec=linguist-qt4
-Icon=linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;

Added: qtconfig-qt4.desktop
===================================================================
--- qtconfig-qt4.desktop	                        (rev 0)
+++ qtconfig-qt4.desktop	2013-03-15 07:32:33 UTC (rev 180053)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt4 Config 
+Comment=Configure Qt4 behavior, styles, fonts
+Exec=qtconfig-qt4
+Icon=qt4logo
+Terminal=false
+Type=Application
+Categories=Qt;Settings;
+NoDisplay=true

Deleted: qtconfig.desktop
===================================================================
--- qtconfig.desktop	2013-03-15 06:27:33 UTC (rev 180052)
+++ qtconfig.desktop	2013-03-15 07:32:33 UTC (rev 180053)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt4 Config 
-Comment=Configure Qt4 behavior, styles, fonts
-Exec=qtconfig-qt4
-Icon=qt4logo
-Terminal=false
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true




More information about the arch-commits mailing list