[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.1-1-28-gc709781



The following commit has been merged in the debian-experimental-3.7 branch:
commit 1059e348d0c3be913a24a4456c54b80fe597c535
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Aug 23 22:57:34 2012 +0200

    clean up clean/clean-debdir

diff --git a/rules b/rules
index e13e896..b600608 100755
--- a/rules
+++ b/rules
@@ -1233,16 +1233,35 @@ endif
 # Clean up the package directories (about 830M) 
 clean-debdir:
 	dh_testdir
+	# remove generated symlinks / java wrappers
+	rm -rf debian/usr
+
+	find debian -name "*.links" -exec rm {} \;
+	if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
+	rm -f debian/shlibs.override.stdlibs
+	rm -f debian/*.bug-script
+	rm -f debian/scripts/aotcompile.py*
+
+	rm -f l10n.fdupes
+	rm -f debian/shlibs.local
+	rm -f debian/*.templates
+
+	rm -f debian/libreoffice-dev-doc.doc-base.*
+	rm -f debian/*.menu
+	for i in base calc core common draw impress math writer; do \
+		rm -f debian/libreoffice-$$i.lintian-overrides; \
+	done
+	rm -f debian/*.install debian/*.dirs debian/*.changelog
+	rm -f debian/catalog.xml
+	rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs
 	rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm debian/*.triggers
+
 	dh_clean
 
 clean:
 	dh_testroot
 	dh_testdir
 
-	# remove generated symlinks / java wrappers
-	rm -rf debian/usr
-
 	if [ -f config.status ]; then \
 		$(MAKE) distclean; \
 		rm -f config.status; \
@@ -1260,27 +1279,10 @@ ifeq "$(HELPISOS)" ""
 	rm -rf images*
 endif
 
+	rm -f download.list
+
 	# Files created in debian directory
 	$(MAKE) -f debian/rules clean-debdir
-	find debian -name "*.links" -exec rm {} \;
-	if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
-	rm -f debian/shlibs.override.stdlibs
-	rm -f debian/*.bug-script
-	rm -f debian/scripts/aotcompile.py*
-
-	rm -f l10n.fdupes
-	rm -f debian/shlibs.local
-	rm -f debian/*.templates
-
-	rm -f debian/libreoffice-dev-doc.doc-base.*
-	rm -f debian/*.menu
-	for i in base calc core common draw impress math writer; do \
-		rm -f debian/libreoffice-$$i.lintian-overrides; \
-	done
-	rm -f debian/*.install debian/*.dirs debian/*.changelog
-	rm -f debian/catalog.xml
-	rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs
-	rm -f download.list
 
 	$(MAKE) -f debian/rules control
 

-- 
LibreOffice packaging repository


Reply to: