[Pkg-tcltk-commits] r1762 - itcl3/trunk/debian

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2015-11-25 12:09:11 +0000 (Wed, 25 Nov 2015)
New Revision: 1762

Modified:
   itcl3/trunk/debian/changelog
   itcl3/trunk/debian/rules
Log:
[itcl3]
  * Fixed building the architecture-independent package only (closes: #806050).


Modified: itcl3/trunk/debian/changelog
===================================================================
--- itcl3/trunk/debian/changelog	2015-11-25 10:49:35 UTC (rev 1761)
+++ itcl3/trunk/debian/changelog	2015-11-25 12:09:11 UTC (rev 1762)
@@ -1,8 +1,8 @@
-itcl3 (3.4.1-3) UNRELEASED; urgency=medium
+itcl3 (3.4.1-3) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Fixed building the architecture-independent package only (closes: #806050).
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 05 Jul 2014 17:35:02 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 25 Nov 2015 15:06:44 +0300
 
 itcl3 (3.4.1-2) unstable; urgency=low
 

Modified: itcl3/trunk/debian/rules
===================================================================
--- itcl3/trunk/debian/rules	2015-11-25 10:49:35 UTC (rev 1761)
+++ itcl3/trunk/debian/rules	2015-11-25 12:09:11 UTC (rev 1762)
@@ -6,6 +6,8 @@
 v1=$(vmajor).$(shell expr $(vminor) + 1)
 dtmp=$(shell pwd)/debian/tmp
 
+tclv=8.5
+
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 include /usr/share/dpkg/architecture.mk
@@ -18,7 +20,7 @@
 		       --includedir=/usr/include/itcl$(vmajor) \
 		       --enable-shared \
 		       --enable-threads \
-		       --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl8.5
+		       --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(tclv)
 
 override_dh_auto_build:
 	$(MAKE) LIBS="-Wl,-soname,\$$@.1"
@@ -73,11 +75,11 @@
           done
 
 override_dh_link:
-	rm -r debian/itcl3-dev/usr/share/doc/itcl3-dev
+	rm -rf debian/itcl$(vmajor)-dev/usr/share/doc/itcl$(vmajor)-dev
 	dh_link
 
 override_dh_makeshlibs:
-	dh_makeshlibs -a -V 'itcl3 (>= $(v)~), itcl3 (<< $(v1)~)'
+	dh_makeshlibs -a -V 'itcl$(vmajor) (>= $(v)~), itcl$(vmajor) (<< $(v1)~)'
 
 get-orig-source:
 	wget -O itcl3_3.4.1.orig.tar.gz \