[Pkg-kde-commits] rev 2312 - trunk/packages/qt4-x11/debian

[Brian Nelson]

Author: pyro
Date: 2005-11-18 09:40:50 +0000 (Fri, 18 Nov 2005)
New Revision: 2312

Added:
   trunk/packages/qt4-x11/debian/qt4-designer.menu
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/qt4-dev-tools.menu
   trunk/packages/qt4-x11/debian/rules
Log:
  * Removed the menu entry for designer-qt4 from qt4-dev-tools.menu, and
    added it to a new qt4-designer.menu
  * Added a tarball of the examples to qt4-doc (Closes: #336832)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2005-11-18 06:09:42 UTC (rev 2311)
+++ trunk/packages/qt4-x11/debian/changelog	2005-11-18 09:40:50 UTC (rev 2312)
@@ -10,8 +10,13 @@
     examples/tools/plugandpaint/plugins/ in the clean target
     (Closes: #339674)
 
- -- Brian Nelson <pyro at debian.org>  Thu, 17 Nov 2005 22:09:07 -0800
+  * Removed the menu entry for designer-qt4 from qt4-dev-tools.menu, and
+    added it to a new qt4-designer.menu
 
+  * Added a tarball of the examples to qt4-doc (Closes: #336832)
+
+ -- Brian Nelson <pyro at debian.org>  Fri, 18 Nov 2005 00:01:22 -0800
+
 qt4-x11 (4.0.1-4) unstable; urgency=low
 
   * debian/control: changed qt4-designer's section to "devel"

Added: trunk/packages/qt4-x11/debian/qt4-designer.menu
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-designer.menu	2005-11-18 06:09:42 UTC (rev 2311)
+++ trunk/packages/qt4-x11/debian/qt4-designer.menu	2005-11-18 09:40:50 UTC (rev 2312)
@@ -0,0 +1,6 @@
+?package(qt4-dev-tools):\
+	needs="x11"\
+	section="Apps/Programming"\
+	hints="KDE"\
+	title="Qt Designer"\
+	command="/usr/bin/designer-qt4"

Modified: trunk/packages/qt4-x11/debian/qt4-dev-tools.menu
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-dev-tools.menu	2005-11-18 06:09:42 UTC (rev 2311)
+++ trunk/packages/qt4-x11/debian/qt4-dev-tools.menu	2005-11-18 09:40:50 UTC (rev 2312)
@@ -9,12 +9,5 @@
 	needs="x11"\
 	section="Apps/Programming"\
 	hints="KDE"\
-	title="Qt Designer"\
-	command="/usr/bin/designer-qt4"
-
-?package(qt4-dev-tools):\
-	needs="x11"\
-	section="Apps/Programming"\
-	hints="KDE"\
 	title="Qt Linguist"\
 	command="/usr/bin/linguist-qt4"

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2005-11-18 06:09:42 UTC (rev 2311)
+++ trunk/packages/qt4-x11/debian/rules	2005-11-18 09:40:50 UTC (rev 2312)
@@ -43,10 +43,10 @@
 	            -cups
 
 clean::
-	-$(MAKE) -C plugins/src distclean
-	-$(MAKE) -C qmake distclean
-	-$(MAKE) -C tools distclean
-	-$(MAKE) distclean
+	-$(MAKE) -k -C plugins/src distclean
+	-$(MAKE) -k -C qmake distclean
+	-$(MAKE) -k -C tools distclean
+	-$(MAKE) -k distclean
 
 	-find . -mindepth 2 -name Makefile -exec rm -f '{}' ';'
 
@@ -100,3 +100,9 @@
 	for f in qmake lupdate lrelease uic moc assistant designer linguist qtconfig; do \
 	    mv "$(BINDIR)/$$f" "$(BINDIR)/$$f-qt4"; \
 	done
+
+binary-install/qt4-doc::
+	# Tar up the examples to include them in qt4-doc
+	-$(MAKE) -k -C examples clean
+	tar -cv examples/ | \
+	gzip -9 > debian/qt4-doc/usr/share/doc/qt4-doc/qt4-examples.tar.gz