[Pkg-tcltk-commits] r1357 - tcl8.4/trunk/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2013-06-24 12:13:20 +0000 (Mon, 24 Jun 2013)
New Revision: 1357

Modified:
   tcl8.4/trunk/debian/changelog
   tcl8.4/trunk/debian/rules
Log:
[tcl8.4]
  * Don't compress manpages twice during build process.


Modified: tcl8.4/trunk/debian/changelog
===================================================================
--- tcl8.4/trunk/debian/changelog	2013-06-24 11:37:07 UTC (rev 1356)
+++ tcl8.4/trunk/debian/changelog	2013-06-24 12:13:20 UTC (rev 1357)
@@ -4,9 +4,10 @@
   * Refreshed patches.
   * Pass CC to compiler and set ac_cv variables, to allow cross builds
     (closes: #597708)
+  * Don't compress manpages twice during build process.
   * Bumped standards version to 3.9.4.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 24 Jun 2013 15:34:57 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 24 Jun 2013 16:09:28 +0400
 
 tcl8.4 (8.4.19-5) unstable; urgency=low
 

Modified: tcl8.4/trunk/debian/rules
===================================================================
--- tcl8.4/trunk/debian/rules	2013-06-24 11:37:07 UTC (rev 1356)
+++ tcl8.4/trunk/debian/rules	2013-06-24 12:13:20 UTC (rev 1357)
@@ -27,12 +27,11 @@
 	TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib" \
 	CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
 	dh_auto_configure -Dunix -- \
-			    --includedir=/usr/include/tcl$(v) \
-			    --enable-shared \
-			    --enable-threads \
-			    --disable-rpath \
-			    --enable-man-symlinks \
-			    --enable-man-compression=gzip
+			  --includedir=/usr/include/tcl$(v) \
+			  --enable-shared \
+			  --enable-threads \
+			  --disable-rpath \
+			  --enable-man-symlinks
 
 override_dh_auto_build:
 	# Another ugly part
@@ -45,7 +44,6 @@
 	  ranlib libtcl$(v).a
 
 override_dh_auto_install:
-	GZIP=-9 \
 	$(MAKE) -C unix INSTALL_ROOT=$(DIR) \
 			MAN_INSTALL_DIR=$(DIR)/usr/share/man \
 			MANN_INSTALL_DIR=$(DIR)/usr/share/man/man3 \
@@ -68,25 +66,24 @@
 	cp compat/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/compat
 	# Fix up the manpages
 	cd debian/tmp/usr/share/man/man1 && \
-	  zcat tclsh.1.gz | sed -e 's/(n)/(3tcl)/g' | gzip -9 > tclsh$(v).1.gz && \
-	  rm tclsh.1.gz
+	  sed -e 's/(n)/(3tcl)/g' tclsh.1 > tclsh$(v).1 && rm tclsh.1
 	cd debian/tmp/usr/share/man/man3 && \
-	  for f in *.[3n].gz ; do \
+	  for f in *.[3n] ; do \
 	     f2=$$(echo $$f | sed -e 's/\.[3n]/.3tcl/') ; \
 	     if [ -L $$f ]; then \
 		l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tcl/') ; \
 		rm $$f ; \
 		ln -sf $$l $$f2 ; \
 	     else \
-		zcat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \
-			       -e 's/\(Tk_[0-9A-Za-z]*\)(3)/\1(3tk)/g' \
-			       -e 's/\([A-Z][0-9A-Za-z_]*\)(3)/\1(3tcl)/g' \
-			       -e 's/send(n)/send(3tk)/g' \
-			       -e 's/text(n)/text(3tk)/g' \
-			       -e 's/tk(n)/tk(3tk)/g' \
-			       -e 's/winfo(n)/winfo(3tk)/g' \
-			       -e 's/(n)/(3tcl)/g' \
-			 | gzip -9 >$$f2 ; \
+		sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \
+		    -e 's/\(Tk_[0-9A-Za-z]*\)(3)/\1(3tk)/g' \
+		    -e 's/\([A-Z][0-9A-Za-z_]*\)(3)/\1(3tcl)/g' \
+		    -e 's/send(n)/send(3tk)/g' \
+		    -e 's/text(n)/text(3tk)/g' \
+		    -e 's/tk(n)/tk(3tk)/g' \
+		    -e 's/winfo(n)/winfo(3tk)/g' \
+		    -e 's/(n)/(3tcl)/g' \
+		    $$f >$$f2 ; \
 		rm $$f ; \
 	     fi ; \
 	  done