rev 9731 - branches/qt4-x11/debian

[Fathi Boudra]

Author: fabo
Date: 2008-03-12 21:10:53 +0000 (Wed, 12 Mar 2008)
New Revision: 9731

Modified:
   branches/qt4-x11/debian/control
   branches/qt4-x11/debian/qt4-demos.install
   branches/qt4-x11/debian/rules
Log:
Unsplit Qt4 examples and demos.
If someone want the split, bug Matthew ;)


Modified: branches/qt4-x11/debian/control
===================================================================
--- branches/qt4-x11/debian/control	2008-03-12 20:57:32 UTC (rev 9730)
+++ branches/qt4-x11/debian/control	2008-03-12 21:10:53 UTC (rev 9731)
@@ -417,16 +417,6 @@
  .
  This package contains Qt 4 examples and demos.
 
-Package: qt4-demos-source
-Architecture: all
-Section: doc
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 examples and demos sources
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains Qt 4 examples and demos sources.
-
 Package: qt4-doc
 Architecture: all
 Section: doc

Modified: branches/qt4-x11/debian/qt4-demos.install
===================================================================
--- branches/qt4-x11/debian/qt4-demos.install	2008-03-12 20:57:32 UTC (rev 9730)
+++ branches/qt4-x11/debian/qt4-demos.install	2008-03-12 21:10:53 UTC (rev 9731)
@@ -1,193 +1,9 @@
 usr/bin/qtdemo
-
-usr/lib/qt4/demos/affine/affine
-usr/lib/qt4/demos/books/books
-usr/lib/qt4/demos/browser/browser
-usr/lib/qt4/demos/chip/chip
-usr/lib/qt4/demos/composition/composition
-usr/lib/qt4/demos/deform/deform
-usr/lib/qt4/demos/embeddeddialogs/embeddeddialogs
-usr/lib/qt4/demos/gradients/gradients
-usr/lib/qt4/demos/interview/interview
-usr/lib/qt4/demos/mainwindow/mainwindow
-usr/lib/qt4/demos/pathstroke/pathstroke
-usr/lib/qt4/demos/spreadsheet/spreadsheet
-usr/lib/qt4/demos/sqlbrowser/sqlbrowser
-usr/lib/qt4/demos/textedit/textedit
-usr/lib/qt4/demos/undo/undo
-
-usr/lib/qt4/examples/assistant/simpletextviewer/simpletextviewer
-usr/lib/qt4/examples/designer/calculatorbuilder/calculatorbuilder
-usr/lib/qt4/examples/designer/calculatorform/calculatorform
-usr/lib/qt4/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder
-usr/lib/qt4/examples/desktop/screenshot/screenshot
-usr/lib/qt4/examples/desktop/systray/systray
-usr/lib/qt4/examples/dialogs/classwizard/classwizard
-usr/lib/qt4/examples/dialogs/configdialog/configdialog
-usr/lib/qt4/examples/dialogs/extension/extension
-usr/lib/qt4/examples/dialogs/findfiles/findfiles
-usr/lib/qt4/examples/dialogs/licensewizard/licensewizard
-usr/lib/qt4/examples/dialogs/standarddialogs/standarddialogs
-usr/lib/qt4/examples/dialogs/tabdialog/tabdialog
-usr/lib/qt4/examples/dialogs/trivialwizard/trivialwizard
-usr/lib/qt4/examples/draganddrop/draggableicons/draggableicons
-usr/lib/qt4/examples/draganddrop/draggabletext/draggabletext
-usr/lib/qt4/examples/draganddrop/dropsite/dropsite
-usr/lib/qt4/examples/draganddrop/fridgemagnets/fridgemagnets
-usr/lib/qt4/examples/draganddrop/puzzle/puzzle
-usr/lib/qt4/examples/graphicsview/collidingmice/collidingmice
-usr/lib/qt4/examples/graphicsview/diagramscene/diagramscene
-usr/lib/qt4/examples/graphicsview/dragdroprobot/dragdroprobot
-usr/lib/qt4/examples/graphicsview/elasticnodes/elasticnodes
-usr/lib/qt4/examples/graphicsview/padnavigator/padnavigator
-usr/lib/qt4/examples/graphicsview/portedasteroids/portedasteroids
-usr/lib/qt4/examples/graphicsview/portedcanvas/portedcanvas
-usr/lib/qt4/examples/ipc/localfortuneclient/localfortuneclient
-usr/lib/qt4/examples/ipc/localfortuneserver/localfortuneserver
-usr/lib/qt4/examples/ipc/sharedmemory/sharedmemory
-usr/lib/qt4/examples/itemviews/addressbook/addressbook
-usr/lib/qt4/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel
-usr/lib/qt4/examples/itemviews/chart/chart
-usr/lib/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory
-usr/lib/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel
-usr/lib/qt4/examples/itemviews/dirview/dirview
-usr/lib/qt4/examples/itemviews/pixelator/pixelator
-usr/lib/qt4/examples/itemviews/puzzle/puzzle
-usr/lib/qt4/examples/itemviews/simpledommodel/simpledommodel
-usr/lib/qt4/examples/itemviews/simpletreemodel/simpletreemodel
-usr/lib/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper
-usr/lib/qt4/examples/itemviews/spinboxdelegate/spinboxdelegate
-usr/lib/qt4/examples/itemviews/stardelegate/stardelegate
-usr/lib/qt4/examples/layouts/basiclayouts/basiclayouts
-usr/lib/qt4/examples/layouts/borderlayout/borderlayout
-usr/lib/qt4/examples/layouts/dynamiclayouts/dynamiclayouts
-usr/lib/qt4/examples/layouts/flowlayout/flowlayout
-usr/lib/qt4/examples/linguist/arrowpad/arrowpad
-usr/lib/qt4/examples/linguist/hellotr/hellotr
-usr/lib/qt4/examples/linguist/trollprint/trollprint
-usr/lib/qt4/examples/mainwindows/application/application
-usr/lib/qt4/examples/mainwindows/dockwidgets/dockwidgets
-usr/lib/qt4/examples/mainwindows/mdi/mdi
-usr/lib/qt4/examples/mainwindows/menus/menus
-usr/lib/qt4/examples/mainwindows/recentfiles/recentfiles
-usr/lib/qt4/examples/mainwindows/sdi/sdi
-usr/lib/qt4/examples/network/blockingfortuneclient/blockingfortuneclient
-usr/lib/qt4/examples/network/broadcastreceiver/broadcastreceiver
-usr/lib/qt4/examples/network/broadcastsender/broadcastsender
-usr/lib/qt4/examples/network/chat/chat
-usr/lib/qt4/examples/network/fortuneclient/fortuneclient
-usr/lib/qt4/examples/network/fortuneserver/fortuneserver
-usr/lib/qt4/examples/network/ftp/ftp
-usr/lib/qt4/examples/network/http/http
-usr/lib/qt4/examples/network/loopback/loopback
-usr/lib/qt4/examples/network/securesocketclient/securesocketclient
-usr/lib/qt4/examples/network/threadedfortuneserver/threadedfortuneserver
-usr/lib/qt4/examples/network/torrent/torrent
-usr/lib/qt4/examples/opengl/2dpainting/2dpainting
-usr/lib/qt4/examples/opengl/framebufferobject/framebufferobject
-usr/lib/qt4/examples/opengl/framebufferobject2/framebufferobject2
-usr/lib/qt4/examples/opengl/grabber/grabber
-usr/lib/qt4/examples/opengl/hellogl/hellogl
-usr/lib/qt4/examples/opengl/overpainting/overpainting
-usr/lib/qt4/examples/opengl/pbuffers/pbuffers
-usr/lib/qt4/examples/opengl/pbuffers2/pbuffers2
-usr/lib/qt4/examples/opengl/samplebuffers/samplebuffers
-usr/lib/qt4/examples/opengl/textures/textures
-usr/lib/qt4/examples/painting/basicdrawing/basicdrawing
-usr/lib/qt4/examples/painting/concentriccircles/concentriccircles
-usr/lib/qt4/examples/painting/fontsampler/fontsampler
-usr/lib/qt4/examples/painting/imagecomposition/imagecomposition
-usr/lib/qt4/examples/painting/painterpaths/painterpaths
-usr/lib/qt4/examples/painting/svgviewer/svgviewer
-usr/lib/qt4/examples/painting/transformations/transformations
-usr/lib/qt4/examples/qdbus/chat/chat
-usr/lib/qt4/examples/qdbus/complexpingpong/complexping
-usr/lib/qt4/examples/qdbus/complexpingpong/complexpong
-usr/lib/qt4/examples/qdbus/listnames/listnames
-usr/lib/qt4/examples/qdbus/pingpong/ping
-usr/lib/qt4/examples/qdbus/pingpong/pong
-usr/lib/qt4/examples/qdbus/remotecontrolledcar/car/car
-usr/lib/qt4/examples/qdbus/remotecontrolledcar/controller/controller
-usr/lib/qt4/examples/qtestlib/tutorial1/tutorial1
-usr/lib/qt4/examples/qtestlib/tutorial2/tutorial2
-usr/lib/qt4/examples/qtestlib/tutorial3/tutorial3
-usr/lib/qt4/examples/qtestlib/tutorial4/tutorial4
-usr/lib/qt4/examples/richtext/calendar/calendar
-usr/lib/qt4/examples/richtext/orderform/orderform
-usr/lib/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter
-usr/lib/qt4/examples/script/calculator/calculator
-usr/lib/qt4/examples/script/context2d/context2d
-usr/lib/qt4/examples/script/customclass/customclass
-usr/lib/qt4/examples/script/defaultprototypes/defaultprototypes
-usr/lib/qt4/examples/script/helloscript/helloscript
-usr/lib/qt4/examples/script/qscript/qscript
-usr/lib/qt4/examples/script/tetrix/tetrix
-usr/lib/qt4/examples/sql/cachedtable/cachedtable
-usr/lib/qt4/examples/sql/drilldown/drilldown
-usr/lib/qt4/examples/sql/masterdetail/masterdetail
-usr/lib/qt4/examples/sql/querymodel/querymodel
-usr/lib/qt4/examples/sql/relationaltablemodel/relationaltablemodel
-usr/lib/qt4/examples/sql/tablemodel/tablemodel
-usr/lib/qt4/examples/threads/mandelbrot/mandelbrot
-usr/lib/qt4/examples/threads/semaphores/semaphores
-usr/lib/qt4/examples/threads/waitconditions/waitconditions
-usr/lib/qt4/examples/tools/codecs/codecs
-usr/lib/qt4/examples/tools/completer/completer
-usr/lib/qt4/examples/tools/customcompleter/customcompleter
-usr/lib/qt4/examples/tools/echoplugin/echoplugin
-usr/lib/qt4/examples/tools/i18n/i18n
-usr/lib/qt4/examples/tools/plugandpaint/plugandpaint
-usr/lib/qt4/examples/tools/regexp/regexp
-usr/lib/qt4/examples/tools/settingseditor/settingseditor
-usr/lib/qt4/examples/tools/styleplugin/styleplugin
-usr/lib/qt4/examples/tools/treemodelcompleter/treemodelcompleter
-usr/lib/qt4/examples/tools/undoframework/undoframework
-usr/lib/qt4/examples/tutorial/t1/t1
-usr/lib/qt4/examples/tutorial/t10/t10
-usr/lib/qt4/examples/tutorial/t11/t11
-usr/lib/qt4/examples/tutorial/t12/t12
-usr/lib/qt4/examples/tutorial/t13/t13
-usr/lib/qt4/examples/tutorial/t14/t14
-usr/lib/qt4/examples/tutorial/t2/t2
-usr/lib/qt4/examples/tutorial/t3/t3
-usr/lib/qt4/examples/tutorial/t4/t4
-usr/lib/qt4/examples/tutorial/t5/t5
-usr/lib/qt4/examples/tutorial/t6/t6
-usr/lib/qt4/examples/tutorial/t7/t7
-usr/lib/qt4/examples/tutorial/t8/t8
-usr/lib/qt4/examples/tutorial/t9/t9
-usr/lib/qt4/examples/widgets/analogclock/analogclock
-usr/lib/qt4/examples/widgets/calculator/calculator
-usr/lib/qt4/examples/widgets/calendarwidget/calendarwidget
-usr/lib/qt4/examples/widgets/charactermap/charactermap
-usr/lib/qt4/examples/widgets/digitalclock/digitalclock
-usr/lib/qt4/examples/widgets/groupbox/groupbox
-usr/lib/qt4/examples/widgets/icons/icons
-usr/lib/qt4/examples/widgets/imageviewer/imageviewer
-usr/lib/qt4/examples/widgets/lineedits/lineedits
-usr/lib/qt4/examples/widgets/movie/movie
-usr/lib/qt4/examples/widgets/scribble/scribble
-usr/lib/qt4/examples/widgets/shapedclock/shapedclock
-usr/lib/qt4/examples/widgets/sliders/sliders
-usr/lib/qt4/examples/widgets/spinboxes/spinboxes
-usr/lib/qt4/examples/widgets/styles/styles
-usr/lib/qt4/examples/widgets/stylesheet/stylesheet
-usr/lib/qt4/examples/widgets/tablet/tablet
-usr/lib/qt4/examples/widgets/tetrix/tetrix
-usr/lib/qt4/examples/widgets/tooltips/tooltips
-usr/lib/qt4/examples/widgets/wiggly/wiggly
-usr/lib/qt4/examples/widgets/windowflags/windowflags
-usr/lib/qt4/examples/xml/dombookmarks/dombookmarks
-usr/lib/qt4/examples/xml/rsslisting/rsslisting
-usr/lib/qt4/examples/xml/saxbookmarks/saxbookmarks
-usr/lib/qt4/examples/xml/streambookmarks/streambookmarks
-usr/lib/qt4/examples/xml/xmlstreamlint/xmlstreamlint
-usr/lib/qt4/examples/xmlpatterns/bibliography/bibliography
-usr/lib/qt4/examples/xmlpatterns/filetree/filetree
-usr/lib/qt4/examples/xmlpatterns/recipes/recipes
-
+usr/lib/qt4/demos
+usr/lib/qt4/examples
 usr/lib/qt4/plugins/designer/libarthurplugin.so
 usr/lib/qt4/plugins/designer/libcontainerextension.so
 usr/lib/qt4/plugins/designer/libcustomwidgetplugin.so
 usr/lib/qt4/plugins/designer/libtaskmenuextension.so
 usr/lib/qt4/plugins/designer/libworldtimeclockplugin.so
+

Modified: branches/qt4-x11/debian/rules
===================================================================
--- branches/qt4-x11/debian/rules	2008-03-12 20:57:32 UTC (rev 9730)
+++ branches/qt4-x11/debian/rules	2008-03-12 21:10:53 UTC (rev 9731)
@@ -178,17 +178,6 @@
 	uudecode -o debian/$(cdbs_curpkg)/usr/share/pixmaps/qtconfig.png \
 		debian/desktop/qtconfig.png.uu
 
-binary-install/qt4-demos-source::
-	mkdir -p debian/$(cdbs_curpkg)/usr/share/qt4
-
-	[ ! -f examples/Makefile ] || $(MAKE) -k -C examples distclean
-	find examples/ -name '*.debug' -print0 | xargs -0r rm -f
-	cp -rf examples debian/$(cdbs_curpkg)/usr/share/qt4/
-
-	[ ! -f demos/Makefile ] || $(MAKE) -k -C demos distclean
-	find demos/ -name '*.debug' -print0 | xargs -0r rm -f
-	cp -rf demos debian/$(cdbs_curpkg)/usr/share/qt4/
-
 binary-install/libqt4-dbg::
 # Run dh_install without the default DEB_DH_INSTALL_ARGS to install the *.debug files
 	dh_install -plibqt4-dbg --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR)