[pkg-kde-commits] rev 2741 - trunk/packages/qt4-x11/debian

Brian Nelson pyro at costa.debian.org
Wed Jan 4 06:18:42 UTC 2006


Author: pyro
Date: 2006-01-04 06:18:41 +0000 (Wed, 04 Jan 2006)
New Revision: 2741

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/rules
Log:
  * debian/rules: improved/cleaned up the clean target

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-01-03 19:03:24 UTC (rev 2740)
+++ trunk/packages/qt4-x11/debian/changelog	2006-01-04 06:18:41 UTC (rev 2741)
@@ -18,8 +18,10 @@
     qt4-qtconfig package, due to its linkage against libqt4-qt3support and
     hence ridiculous dependency chain.
 
- -- Brian Nelson <pyro at debian.org>  Mon,  2 Jan 2006 20:27:33 -0500
+  * debian/rules: improved/cleaned up the clean target
 
+ -- Brian Nelson <pyro at debian.org>  Wed,  4 Jan 2006 01:16:17 -0500
+
 qt4-x11 (4.0.1-6) unstable; urgency=low
 
   * Added a target to automatically install lintian overrides, stolen from

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2006-01-03 19:03:24 UTC (rev 2740)
+++ trunk/packages/qt4-x11/debian/rules	2006-01-04 06:18:41 UTC (rev 2741)
@@ -12,7 +12,7 @@
 DEB_MAKE_BUILD_TARGET := sub-src sub-tools 
 DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_MAKE_CLEAN_TARGET := distclean
+DEB_MAKE_CLEAN_TARGET := confclean distclean
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 DEB_INSTALL_CHANGELOGS_ALL := changes-4.1.0
 
@@ -43,53 +43,21 @@
 	            -cups
 
 clean::
-	-$(MAKE) -k -C plugins/src distclean
-	-$(MAKE) -k -C qmake distclean
-	-$(MAKE) -k -C tools distclean
-	-$(MAKE) -k confclean
+	# Extra stuff missed by confclean/distclean
+	rm -f bin/qmake \
+	      mkspecs/default \
+	      src/corelib/global/arch \
+	      examples/tools/plugandpaint/plugins/*.so \
+	      config.status \
+	      demos/shared/libdemo_shared.prl \
+	      mkspecs/qconfig.pri \
+	      src/corelib/global/qconfig.*
 
-	-find . -mindepth 2 -name Makefile -exec rm -f '{}' ';'
+	rm -rf lib/ plugins/
 
-# Force these since the build system makes them read-only
-	rm -f src/corelib/global/qconfig.cpp src/corelib/global/qconfig.h
+	find include/ -type l -print0 | xargs -0r rm -f
+	find . -mindepth 2 -name 'Makefile*' -print0 | xargs -0r rm -f
 
-# Don't force these, use the '-' thing instead so that failed deletions
-# are displayed so that these may be cleaned out as upstream improves
-# the clean target.
-	-rm .qmake.cache \
-	    config.status \
-	    bin/qmake \
-	    src/corelib/global/qconfig.h.qmake \
-	    src/corelib/global/arch \
-	    tools/designer/src/plugins/tools/view3d/Makefile.Debug \
-	    tools/designer/src/plugins/tools/view3d/Makefile.Release \
-	    mkspecs/default \
-	    mkspecs/qconfig.pri \
-	    config.tests/unix/ptrsize/ptrsizetest.o \
-	    config.tests/unix/ptrsize/ptrsizetest \
-	    config.tests/unix/ipv6/ipv6test.o \
-	    config.tests/unix/ipv6/ipv6test \
-	    config.tests/unix/endian/endiantest.o \
-	    config.tests/unix/endian/endiantest \
-	    config.tests/unix/largefile/largefiletest.o \
-	    config.tests/unix/largefile/largefiletest \
-	    config.tests/unix/stl/stltest.o \
-	    config.tests/unix/stl/stltest \
-	    config.tests/unix/getaddrinfo/getaddrinfotest.o \
-	    config.tests/unix/getaddrinfo/getaddrinfotest \
-	    lib/* \
-	    include/Qt/arch \
-	    include/QtCore/arch \
-	    include/Qt/qconfig.h \
-	    include/QtCore/qconfig.h \
-	    plugins/designer/*.prl \
-	    plugins/designer/lib*.so* \
-	    plugins/accessible/lib*.so* \
-	    plugins/codecs/lib*.so* \
-	    plugins/imageformats/lib*.so* \
-	    examples/tools/plugandpaint/plugins/*.so \
-	    demos/shared/libdemo_shared.prl
-
 # Hack to fix dpatch-edit-patch
 unpatch: deapply-dpatches
 




More information about the pkg-kde-commits mailing list