[Pkg-ocaml-maint-commits] r1785 - trunk/packages/mldonkey/trunk/debian

[Sylvain LE GALL]

Author: gildor-guest
Date: 2005-09-20 22:32:39 +0000 (Tue, 20 Sep 2005)
New Revision: 1785

Modified:
   trunk/packages/mldonkey/trunk/debian/changelog
   trunk/packages/mldonkey/trunk/debian/rules
Log:
Rules clean up -- SLG


Modified: trunk/packages/mldonkey/trunk/debian/changelog
===================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog	2005-09-20 21:51:53 UTC (rev 1784)
+++ trunk/packages/mldonkey/trunk/debian/changelog	2005-09-20 22:32:39 UTC (rev 1785)
@@ -12,6 +12,7 @@
   * Remove Directconnect from package description, since it is no more
     supported
   * Correct the package description (overnet is written twice)
+  * Use distclean for the clean target
 
  -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Tue, 20 Sep 2005 00:07:22 +0200
 

Modified: trunk/packages/mldonkey/trunk/debian/rules
===================================================================
--- trunk/packages/mldonkey/trunk/debian/rules	2005-09-20 21:51:53 UTC (rev 1784)
+++ trunk/packages/mldonkey/trunk/debian/rules	2005-09-20 22:32:39 UTC (rev 1785)
@@ -69,20 +69,9 @@
 build: patch-stamp build-arch build-indep
 
 maintainer-clean:
-	# Bug in 2.5.27
-	-cp src/gtk2/newgui/gui_console_base.ml   src/gtk2/newgui/gui_console_base.mls
-	-cp src/gtk2/newgui/gui_cdget_base.ml     src/gtk2/newgui/gui_cdget_base.mls
-	-cp src/gtk2/newgui/gui_installer_base.ml src/gtk2/newgui/gui_installer_base.mls
-	-cp src/gtk2/im/gui_im_base.ml            src/gtk2/im/gui_im_base.mls
 	# Prevent the rebuild of configure
-	#touch config/configure
-	-$(MAKE) maintainerclean
+	-$(MAKE) distclean
 	-$(RM) config/confdefs.h
-	# Bug in 2.5.27
-	-mv -f src/gtk2/newgui/gui_console_base.mls   src/gtk2/newgui/gui_console_base.ml
-	-mv -f src/gtk2/newgui/gui_cdget_base.mls     src/gtk2/newgui/gui_cdget_base.ml
-	-mv -f src/gtk2/newgui/gui_installer_base.mls src/gtk2/newgui/gui_installer_base.ml
-	-mv -f src/gtk2/im/gui_im_base.mls            src/gtk2/im/gui_im_base.ml
 
 unpatch: maintainer-clean
 
@@ -94,17 +83,8 @@
 	# Add here commands to clean up after the build process.
 	cd debian/xml-man && $(MAKE) clean
 	cd debian/utils && $(MAKE) clean
-	-$(RM) use_tags
-	-$(RM) config/Makefile.config.i[3456]86
-	-$(RM) icons/kde/*.ml_icons
-	-$(RM) icons/kde/*.ml
-	-$(RM) .depend
-	-$(RM) packages/rpm/*.spec
-	-$(RM) packages/windows/mlnet.nsi
-	-$(RM) src/utils/lib/autoconf.ml
-	-$(RM) src/utils/lib/gAutoconf.ml
-	-$(RM) src/utils/lib/autoconf.ml.new
-	-$(RM) src/utils/lib/gAutoconf.ml.new
+	-$(RM) config/trying
+	-$(RM) packages/rpm/Makefile
 	-$(RM) *.ini *.ini.old
 	-$(RM) build-arch-stamp build-indep-stamp 
 	dh_clean