rev 13992 - trunk/packages/qt-creator/debian

Fathi Boudra fabo at alioth.debian.org
Thu Mar 5 16:17:10 UTC 2009


Author: fabo
Date: 2009-03-05 16:17:10 +0000 (Thu, 05 Mar 2009)
New Revision: 13992

Added:
   trunk/packages/qt-creator/debian/qt-creator.lintian
   trunk/packages/qt-creator/debian/qt-creator.postinst
Removed:
   trunk/packages/qt-creator/debian/not-installed
Modified:
   trunk/packages/qt-creator/debian/copyright
   trunk/packages/qt-creator/debian/qt-creator-doc.install
   trunk/packages/qt-creator/debian/qt-creator.install
   trunk/packages/qt-creator/debian/rules
Log:
Update installed files.
Update rules: cleanup, remove useless bits.
Add postinst for dh_desktop/debhelper script fragment.
Fix lintian warning on copyright.
Remove not-installed files. Useless.
Add lintian file for the private libraries and plugins.


Modified: trunk/packages/qt-creator/debian/copyright
===================================================================
--- trunk/packages/qt-creator/debian/copyright	2009-03-05 14:16:17 UTC (rev 13991)
+++ trunk/packages/qt-creator/debian/copyright	2009-03-05 16:17:10 UTC (rev 13992)
@@ -92,7 +92,8 @@
     © 2009, Jeremy Lainé <jeremy.laine at m4x.org>
     © 2009, Jonathan Riddell <jriddell at ubuntu.com>
 
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+and is licensed under the GNU General Public License version 2,
+see `/usr/share/common-licenses/GPL-2'.
 
 Nokia Qt LGPL Exception version 1.0
 

Deleted: trunk/packages/qt-creator/debian/not-installed

Modified: trunk/packages/qt-creator/debian/qt-creator-doc.install
===================================================================
--- trunk/packages/qt-creator/debian/qt-creator-doc.install	2009-03-05 14:16:17 UTC (rev 13991)
+++ trunk/packages/qt-creator/debian/qt-creator-doc.install	2009-03-05 16:17:10 UTC (rev 13992)
@@ -1 +1 @@
-#usr/share/qtcreator/doc/qtcreator.qch
+share/doc/qtcreator/qtcreator.qch usr/share/qtcreator/doc/
\ No newline at end of file

Modified: trunk/packages/qt-creator/debian/qt-creator.install
===================================================================
--- trunk/packages/qt-creator/debian/qt-creator.install	2009-03-05 14:16:17 UTC (rev 13991)
+++ trunk/packages/qt-creator/debian/qt-creator.install	2009-03-05 16:17:10 UTC (rev 13992)
@@ -1,13 +1,14 @@
+debian/qtcreator.desktop usr/share/applications/
+debian/Nokia-QtCreator.xml usr/share/mime/packages/
 usr/bin/qtcreator
-usr/lib/libAggregation.so.*
-usr/lib/libCPlusPlus.so.*
-usr/lib/libExtensionSystem.so.*
-usr/lib/libQtConcurrent.so.*
-usr/lib/libUtils.so.*
+usr/lib/qtcreator/libAggregation.*
+usr/lib/qtcreator/libCPlusPlus.*
+usr/lib/qtcreator/libExtensionSystem.*
+usr/lib/qtcreator/libQtConcurrent.*
+usr/lib/qtcreator/libUtils.*
 usr/lib/qtcreator/plugins/Nokia/BinEditor.pluginspec
 usr/lib/qtcreator/plugins/Nokia/Bookmarks.pluginspec
 usr/lib/qtcreator/plugins/Nokia/CMakeProjectManager.pluginspec
-usr/lib/qtcreator/plugins/Nokia/CodePaster.pluginspec
 usr/lib/qtcreator/plugins/Nokia/Core.pluginspec
 usr/lib/qtcreator/plugins/Nokia/CppEditor.pluginspec
 usr/lib/qtcreator/plugins/Nokia/CppTools.pluginspec
@@ -27,7 +28,6 @@
 usr/lib/qtcreator/plugins/Nokia/libBinEditor.so
 usr/lib/qtcreator/plugins/Nokia/libBookmarks.so
 usr/lib/qtcreator/plugins/Nokia/libCMakeProjectManager.so
-usr/lib/qtcreator/plugins/Nokia/libCodePaster.so
 usr/lib/qtcreator/plugins/Nokia/libCore.so
 usr/lib/qtcreator/plugins/Nokia/libCppEditor.so
 usr/lib/qtcreator/plugins/Nokia/libCppTools.so
@@ -44,17 +44,17 @@
 usr/lib/qtcreator/plugins/Nokia/libSubversion.so
 usr/lib/qtcreator/plugins/Nokia/libTextEditor.so
 usr/lib/qtcreator/plugins/Nokia/libVCSBase.so
-usr/share/pixmaps/qtcreator_logo_128.png                                  
-usr/share/pixmaps/qtcreator_logo_16.png                                   
-usr/share/pixmaps/qtcreator_logo_24.png                                   
-usr/share/pixmaps/qtcreator_logo_256.png                                  
-usr/share/pixmaps/qtcreator_logo_32.png                                   
-usr/share/pixmaps/qtcreator_logo_48.png                                   
-usr/share/pixmaps/qtcreator_logo_512.png                                  
+usr/share/pixmaps/qtcreator_logo_128.png
+usr/share/pixmaps/qtcreator_logo_16.png
+usr/share/pixmaps/qtcreator_logo_24.png
+usr/share/pixmaps/qtcreator_logo_256.png
+usr/share/pixmaps/qtcreator_logo_32.png
+usr/share/pixmaps/qtcreator_logo_48.png
+usr/share/pixmaps/qtcreator_logo_512.png
 usr/share/pixmaps/qtcreator_logo_64.png
 usr/share/qtcreator/designer/templates/Dialog_with_Buttons_Bottom.ui
-usr/share/qtcreator/designer/templates/Dialog_with_Buttons_Right.ui 
-usr/share/qtcreator/designer/templates/Dialog_without_Buttons.ui    
+usr/share/qtcreator/designer/templates/Dialog_with_Buttons_Right.ui
+usr/share/qtcreator/designer/templates/Dialog_without_Buttons.ui
 usr/share/qtcreator/designer/templates/Main_Window.ui
 usr/share/qtcreator/designer/templates/Widget.ui
 usr/share/qtcreator/designer/templates/templates.xml

Added: trunk/packages/qt-creator/debian/qt-creator.lintian
===================================================================
--- trunk/packages/qt-creator/debian/qt-creator.lintian	                        (rev 0)
+++ trunk/packages/qt-creator/debian/qt-creator.lintian	2009-03-05 16:17:10 UTC (rev 13992)
@@ -0,0 +1,44 @@
+# Private libraries and plugins. They need rpath.
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/libAggregation.so.1.0.0 $ORIGIN/../lib/qtcreator
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/libCPlusPlus.so.1.0.0 $ORIGIN/../lib/qtcreator
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/libExtensionSystem.so.1.0.0 $ORIGIN/../lib/qtcreator
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/libQtConcurrent.so.1.0.0 $ORIGIN/../lib/qtcreator
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/libUtils.so.1.0.0 $ORIGIN/../lib/qtcreator
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libBinEditor.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libBinEditor.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libBookmarks.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libBookmarks.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libCMakeProjectManager.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libCMakeProjectManager.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libCore.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libCore.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libCppEditor.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libCppEditor.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libCppTools.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libCppTools.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libDebugger.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libDebugger.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libFakeVim.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libFakeVim.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libFind.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libFind.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libHelp.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libHelp.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libPerforce.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libPerforce.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libProjectExplorer.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libProjectExplorer.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libQt4ProjectManager.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libQt4ProjectManager.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libQtScriptEditor.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libQtScriptEditor.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libQuickOpen.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libQuickOpen.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libScmGit.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libScmGit.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libSubversion.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libSubversion.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libTextEditor.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libTextEditor.so $ORIGIN/../..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libVCSBase.so $ORIGIN/..
+qt-creator: binary-or-shlib-defines-rpath ./usr/lib/qtcreator/plugins/Nokia/libVCSBase.so $ORIGIN/../..

Added: trunk/packages/qt-creator/debian/qt-creator.postinst
===================================================================
--- trunk/packages/qt-creator/debian/qt-creator.postinst	                        (rev 0)
+++ trunk/packages/qt-creator/debian/qt-creator.postinst	2009-03-05 16:17:10 UTC (rev 13992)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0

Modified: trunk/packages/qt-creator/debian/rules
===================================================================
--- trunk/packages/qt-creator/debian/rules	2009-03-05 14:16:17 UTC (rev 13991)
+++ trunk/packages/qt-creator/debian/rules	2009-03-05 16:17:10 UTC (rev 13992)
@@ -5,27 +5,21 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-# Don't compress our Qt help database
-DEB_COMPRESS_EXCLUDE := .qch
-
 # Don't add unnecessary ldconfig to postinst
 DEB_DH_MAKESHLIBS_ARGS_ALL := -n
 
-DEB_DH_SHLIBDEPS_ARGS := -l$(DEB_DESTDIR)/usr/lib/qtcreator/
+DEB_DH_SHLIBDEPS_ARGS := \
+	-l$(DEB_DESTDIR)/usr/lib/qtcreator/ \
+	-Xusr/lib/qtcreator/plugins/
 
-install/qt-creator::
-	install -D -p -m 0644 debian/qtcreator.desktop \
-		$(DEB_DESTDIR)/usr/share/applications/qtcreator.desktop
-	install -D -p -m 0644 debian/Nokia-QtCreator.xml \
-		$(DEB_DESTDIR)/usr/share/mime/packages/Nokia-QtCreator.xml
-	install -D -p -m 0644 share/doc/qtcreator/qtcreator.qch \
-		$(DEB_DESTDIR)/usr/share/qtcreator/doc/qtcreator.qch
+binary-install/qt-creator::
+	install -D -p -m644 debian/$(cdbs_curpkg).lintian \
+		debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
 
 	# Fix lintian warnings
-	find $(DEB_DESTDIR) -type f -name '*.png' | xargs chmod -x
+	find debian/$(cdbs_curpkg) -type f -name '*.png' | xargs chmod -x
 
 	dh_desktop -p$(cdbs_curpkg)
 
 clean::
 	rm -rf bin lib share/doc
-	find . -name Makefile | xargs rm -f




More information about the pkg-kde-commits mailing list