[Pkg-cli-libs-commits] [SCM] newtonsoft-json branch, master, updated. debian/4.5r5-1

Chow Loong Jin hyperair at debian.org
Thu May 31 21:04:38 UTC 2012


The following commit has been merged in the master branch:
commit 1b4672ff0d64dcf6b1fd95d0a38b8ab2c4c55f11
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu May 31 17:34:04 2012 +0800

    Tidy up debian/rules
    
     - Remove existence checks and just use rm -f instead.
     - Use [ ] instead of test.

diff --git a/debian/rules b/debian/rules
index 5b8c269..2b4ea64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ ZIPFILE = $(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM).zip
 TARFILE = $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
 
 get-orig-source:
-	! test -e '$(ZIPFILE)' && ! test -e $(TARFILE)
+	! [ -e '$(ZIPFILE)' ] && ! [ -e '$(TARFILE)' ]
 	wget '$(UPSTREAM_URL)' -O '$(ZIPFILE)'
 	unzip -d '$(UNPACK_DIR)' '$(ZIPFILE)'
 	GZIP="-9fn --rsyncable" tar -czf $(TARFILE) $(UNPACK_DIR)	\
@@ -38,8 +38,8 @@ override_dh_auto_build:
 		monodoc
 
 override_dh_auto_clean:
-	[ ! -e monodoc ] || rm -r monodoc
-	rm -r							\
+	rm -rf							\
+		monodoc						\
 		Newtonsoft.Json.tree Newtonsoft.Json.zip	\
 		Source/Src/Newtonsoft.Json/bin/			\
 		Source/Src/Newtonsoft.Json/obj/
@@ -55,4 +55,4 @@ override_dh_install: debian/newtonsoft-json.pc
 
 override_dh_clean:
 	dh_clean
-	! [ -e debian/newtonsoft-json.pc ] || rm debian/newtonsoft-json.pc
+	rm -f debian/newtonsoft-json.pc

-- 
newtonsoft-json



More information about the Pkg-cli-libs-commits mailing list