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

r5595 - tzdata/trunk/debian



Author: aurel32
Date: 2013-05-13 21:18:17 +0000 (Mon, 13 May 2013)
New Revision: 5595

Modified:
   tzdata/trunk/debian/changelog
   tzdata/trunk/debian/control
   tzdata/trunk/debian/rules
Log:
  * Use rdfind + symlinks instead of fdupes + handcoded shell script to
    get rid of hardlinks.



Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog	2013-05-13 17:13:34 UTC (rev 5594)
+++ tzdata/trunk/debian/changelog	2013-05-13 21:18:17 UTC (rev 5595)
@@ -1,3 +1,10 @@
+tzdata (2013c-2) UNRELEASED; urgency=low
+
+  * Use rdfind + symlinks instead of fdupes + handcoded shell script to
+    get rid of hardlinks.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sat, 11 May 2013 17:22:18 +0200
+
 tzdata (2013c-1) experimental; urgency=low
 
   * New upstream version.

Modified: tzdata/trunk/debian/control
===================================================================
--- tzdata/trunk/debian/control	2013-05-13 17:13:34 UTC (rev 5594)
+++ tzdata/trunk/debian/control	2013-05-13 21:18:17 UTC (rev 5595)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: required
 Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: po-debconf, openjdk-6-jre-headless, fdupes
+Build-Depends-Indep: po-debconf, openjdk-6-jre-headless, rdfind, symlinks
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
 Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>
 Standards-Version: 3.9.4

Modified: tzdata/trunk/debian/rules
===================================================================
--- tzdata/trunk/debian/rules	2013-05-13 17:13:34 UTC (rev 5594)
+++ tzdata/trunk/debian/rules	2013-05-13 21:18:17 UTC (rev 5595)
@@ -75,18 +75,8 @@
 	/usr/sbin/zic -d $(TZGEN) -p America/New_York
 
 	# Replace hardlinks by symlinks
-	cd $(TZGEN) ; \
-	fdupes -1 -H -q -R . | while read line ; do \
-	  set -- $${line} ; \
-	  tgt="$${1##./}" ; \
-	  shift ; \
-	  while [ "$$#" != 0 ] ; do \
-	    link="$${1##./}" ; \
-	    reltgt="$$(echo $$link | sed -e 's,[^/]\+$$,,g' -e 's,[^/]\+,..,g')$${tgt}" ; \
-	    ln -sf $${reltgt} $${link} ; \
-	    shift ; \
-	  done ; \
-	done
+	rdfind -outputname /dev/null -makesymlinks true -removeidentinode false $(TZGEN)
+	symlinks -r -s -c $(TZGEN)
 
 	# Generate a java version
 	$(JHOME)/bin/java -jar $(JHOME)/jre/lib/javazic.jar -V $(VERSION) -d $(TZGEN_JAVA) $(TIMEZONES) $(TIMEZONES_JAVA)


Reply to: