[Pkg-tcltk-commits] r1807 - in itk3/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2016-03-04 07:50:34 +0000 (Fri, 04 Mar 2016)
New Revision: 1807

Removed:
   itk3/trunk/debian/itk3-doc.docs
   itk3/trunk/debian/itk3.docs
   itk3/trunk/debian/patches/non-linux.patch
Modified:
   itk3/trunk/debian/changelog
   itk3/trunk/debian/patches/series
   itk3/trunk/debian/rules
Log:
[itk3]
  * New upstream release.
  * Removed no longer necessary patch.


Modified: itk3/trunk/debian/changelog
===================================================================
--- itk3/trunk/debian/changelog	2016-03-03 13:50:29 UTC (rev 1806)
+++ itk3/trunk/debian/changelog	2016-03-04 07:50:34 UTC (rev 1807)
@@ -1,8 +1,9 @@
-itk3 (3.3-7) UNRELEASED; urgency=medium
+itk3 (3.4.2-1) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Removed no longer necessary patch.
 
- -- Sergei Golovan <sgolovan at debian.org>  Wed, 25 Nov 2015 15:58:33 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 04 Mar 2016 10:49:38 +0300
 
 itk3 (3.3-6) unstable; urgency=medium
 

Deleted: itk3/trunk/debian/itk3-doc.docs
===================================================================
--- itk3/trunk/debian/itk3-doc.docs	2016-03-03 13:50:29 UTC (rev 1806)
+++ itk3/trunk/debian/itk3-doc.docs	2016-03-04 07:50:34 UTC (rev 1807)
@@ -1,4 +0,0 @@
-README
-INCOMPATIBLE
-TODO
-CHANGES

Deleted: itk3/trunk/debian/itk3.docs
===================================================================
--- itk3/trunk/debian/itk3.docs	2016-03-03 13:50:29 UTC (rev 1806)
+++ itk3/trunk/debian/itk3.docs	2016-03-04 07:50:34 UTC (rev 1807)
@@ -1,4 +0,0 @@
-README
-INCOMPATIBLE
-TODO
-CHANGES

Deleted: itk3/trunk/debian/patches/non-linux.patch
===================================================================
--- itk3/trunk/debian/patches/non-linux.patch	2016-03-03 13:50:29 UTC (rev 1806)
+++ itk3/trunk/debian/patches/non-linux.patch	2016-03-04 07:50:34 UTC (rev 1807)
@@ -1,25 +0,0 @@
-Patch by Sergei Golovan fixes build on hurd-i386, kfreebsd-i386,
-kfreebsd-amd64 architectures.
-
---- itk3-3.3.orig/configure
-+++ itk3-3.3/configure
-@@ -8268,7 +8268,7 @@
- 	        fi
- 	    fi
- 	    ;;
--	Linux*)
-+	Linux*|GNU*)
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD_LIBS='${LIBS}'
- 	    SHLIB_SUFFIX=".so"
---- itk3-3.3.orig/tclconfig/tcl.m4
-+++ itk3-3.3/tclconfig/tcl.m4
-@@ -1249,7 +1249,7 @@
- 	        fi
- 	    fi
- 	    ;;
--	Linux*)
-+	Linux*|GNU*)
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD_LIBS='${LIBS}'
- 	    SHLIB_SUFFIX=".so"

Modified: itk3/trunk/debian/patches/series
===================================================================
--- itk3/trunk/debian/patches/series	2016-03-03 13:50:29 UTC (rev 1806)
+++ itk3/trunk/debian/patches/series	2016-03-04 07:50:34 UTC (rev 1807)
@@ -1,2 +1 @@
 stubs.patch
-non-linux.patch

Modified: itk3/trunk/debian/rules
===================================================================
--- itk3/trunk/debian/rules	2016-03-03 13:50:29 UTC (rev 1806)
+++ itk3/trunk/debian/rules	2016-03-04 07:50:34 UTC (rev 1807)
@@ -16,6 +16,7 @@
 	dh $@
 
 override_dh_auto_configure:
+	LDFLAGS="$(LDFLAGS) -Wl,-soname,\$$@.1" \
 	dh_auto_configure -- \
 		       --includedir=/usr/include/itcl$(vmajor) \
 		       --enable-shared \
@@ -25,7 +26,7 @@
 		       --with-tk=/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(tclv)
 
 override_dh_auto_build:
-	$(MAKE) LIBS="-Wl,-soname,\$$@.1"
+	$(MAKE)
 
 ovarride_dh_clean:
 	[ ! -f Makefile ] || $(MAKE) clean
@@ -89,8 +90,9 @@
 override_dh_makeshlibs:
 	dh_makeshlibs -a -V 'itk$(vmajor) (>= $(v)~), itk$(vmajor) (<< $(v1)~)'
 
-source diff:
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+get-orig-source:
+	wget -O itk3_3.4.2.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/incrtcl/itk3.4.2.tar.gz
 
 .PHONY: override_dh_auto_configure override_dh_auto_build override_dh_clean override_dh_auto_test \
 	override_dh_auto_install override_dh_makeshlibs override_dh_link get-orig-source