[Pkg-tcltk-commits] r1755 - in blt/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Wed Nov 25 08:48:31 UTC 2015
Author: sgolovan
Date: 2015-11-25 08:48:30 +0000 (Wed, 25 Nov 2015)
New Revision: 1755
Removed:
blt/trunk/debian/patches/distclean.patch
Modified:
blt/trunk/debian/changelog
blt/trunk/debian/control
blt/trunk/debian/patches/install.patch
blt/trunk/debian/patches/ldflags.patch
blt/trunk/debian/patches/pkgindex.patch
blt/trunk/debian/patches/series
blt/trunk/debian/patches/usetclint.patch
blt/trunk/debian/patches/usetkint.patch
blt/trunk/debian/rules
Log:
[blt]
* debian/patches/autoreconf.patch: fix autotools input for
compatibility with recent autoconf. Thanks to Helmut Grohne
<helmut at subdivi.de> and Steve Langasek <vorlon at debian.org>
(closes: #772590).
* debian/patches/pkgindex.patch: correct this patch to patch the
configure.in source, not the generated configure script.
* debian/patches/install.patch: fix the distclean targets.
* debian/patches/*: remove patching of autogenerated configure
* Drop debian/rules override_dh_clean target, which gets it wrong.
Modified: blt/trunk/debian/changelog
===================================================================
--- blt/trunk/debian/changelog 2015-11-25 08:34:10 UTC (rev 1754)
+++ blt/trunk/debian/changelog 2015-11-25 08:48:30 UTC (rev 1755)
@@ -5,6 +5,15 @@
* Fixed the override_dh_installdoc target in debian/rules to fix FTBFS
when dpkg-buildpackage -A is called for building the architecture-
independent packages only (closes: #805999).
+ * debian/patches/autoreconf.patch: fix autotools input for
+ compatibility with recent autoconf. Thanks to Helmut Grohne
+ <helmut at subdivi.de> and Steve Langasek <vorlon at debian.org>
+ (closes: #772590).
+ * debian/patches/pkgindex.patch: correct this patch to patch the
+ configure.in source, not the generated configure script.
+ * debian/patches/install.patch: fix the distclean targets.
+ * debian/patches/*: remove patching of autogenerated configure
+ * Drop debian/rules override_dh_clean target, which gets it wrong.
-- Sergei Golovan <sgolovan at debian.org> Wed, 25 Nov 2015 11:28:10 +0300
Modified: blt/trunk/debian/control
===================================================================
--- blt/trunk/debian/control 2015-11-25 08:34:10 UTC (rev 1754)
+++ blt/trunk/debian/control 2015-11-25 08:48:30 UTC (rev 1755)
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Sergei Golovan <sgolovan at debian.org>
-Build-Depends: tk8.6-dev, debhelper (>= 9), autotools-dev (>= 20120210.1), dpkg-dev (>= 1.16.1)
+Build-Depends: tk8.6-dev, debhelper (>= 9), dpkg-dev (>= 1.16.1), dh-autoreconf
Standards-Version: 3.9.6
Homepage: http://blt.sourceforge.net/
Deleted: blt/trunk/debian/patches/distclean.patch
===================================================================
--- blt/trunk/debian/patches/distclean.patch 2015-11-25 08:34:10 UTC (rev 1754)
+++ blt/trunk/debian/patches/distclean.patch 2015-11-25 08:48:30 UTC (rev 1755)
@@ -1,15 +0,0 @@
-Author: Sergei Golovan
-Description: Patch fixes recursion in the distclean target of Makefile.in.
-Last-Modified: Wed, 25 Nov 2015 11:23:52 +0300
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -72,7 +72,7 @@
- config.status config.cache config.log Makefile
-
- distclean: clean
-- (cd src; $(MAKE) distclean)
-+ (cd generic; $(MAKE) distclean)
- (cd library; $(MAKE) distclean)
- (cd man; $(MAKE) distclean)
- (cd demos; $(MAKE) distclean)
Modified: blt/trunk/debian/patches/install.patch
===================================================================
--- blt/trunk/debian/patches/install.patch 2015-11-25 08:34:10 UTC (rev 1754)
+++ blt/trunk/debian/patches/install.patch 2015-11-25 08:48:30 UTC (rev 1755)
@@ -2,10 +2,13 @@
INSTALL_ROOT. Also, it adds bltOldConfig.h to the installable headers
list and fixes it to include tk.h.
Author: Chris Waters and Sergei Golovan
-Last-Modified: Fri, 04 Jul 2014 09:32:58 +0400
+Author: Steve Langasek <vorlon at debian.org>
+Last-Modified: Mon, 31 Aug 2015 12:37:00 -0700
---- a/Makefile.in
-+++ b/Makefile.in
+Index: blt-2.5.3+dfsg/Makefile.in
+===================================================================
+--- blt-2.5.3+dfsg.orig/Makefile.in
++++ blt-2.5.3+dfsg/Makefile.in
@@ -47,9 +47,9 @@
(cd library; $(MAKE) install)
(cd man; $(MAKE) install)
@@ -39,13 +42,15 @@
config.status config.cache config.log Makefile
distclean: clean
-+ (cd src; $(MAKE) distclean)
++ (cd generic; $(MAKE) distclean)
+ (cd library; $(MAKE) distclean)
+ (cd man; $(MAKE) distclean)
+ (cd demos; $(MAKE) distclean)
$(RM) $(GENERATED_FILES)
---- a/generic/Makefile.in
-+++ b/generic/Makefile.in
+Index: blt-2.5.3+dfsg/generic/Makefile.in
+===================================================================
+--- blt-2.5.3+dfsg.orig/generic/Makefile.in
++++ blt-2.5.3+dfsg/generic/Makefile.in
@@ -152,6 +152,7 @@
$(srcdir)/bltChain.h \
bltHash.h \
@@ -73,8 +78,10 @@
.c.o:
$(CC) -c $(CC_SWITCHES) $<
---- a/generic/shared/Makefile.in
-+++ b/generic/shared/Makefile.in
+Index: blt-2.5.3+dfsg/generic/shared/Makefile.in
+===================================================================
+--- blt-2.5.3+dfsg.orig/generic/shared/Makefile.in
++++ blt-2.5.3+dfsg/generic/shared/Makefile.in
@@ -145,14 +145,20 @@
$(srcdir)/bltInit.c
$(RM) $@
@@ -98,7 +105,7 @@
install: mkdirs install-lib install-demo
-@@ -175,7 +181,7 @@
+@@ -175,10 +181,10 @@
done
clean:
$(RM) $(OBJS) $(lib_so) $(tcl_only_lib_so) $(bltwish) $(bltsh) \
@@ -106,9 +113,15 @@
+ *pure* .pure* bltInit.o
distclean: clean
- $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"*
---- a/demos/Makefile.in
-+++ b/demos/Makefile.in
+- $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"*
++ $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* Makefile
+
+ # ------------------------------------------------------------------------
+ # in lieu of viewpath-ing...
+Index: blt-2.5.3+dfsg/demos/Makefile.in
+===================================================================
+--- blt-2.5.3+dfsg.orig/demos/Makefile.in
++++ blt-2.5.3+dfsg/demos/Makefile.in
@@ -79,7 +79,7 @@
: ; \
else \
@@ -118,8 +131,10 @@
fi ; \
done
---- a/man/Makefile.in
-+++ b/man/Makefile.in
+Index: blt-2.5.3+dfsg/man/Makefile.in
+===================================================================
+--- blt-2.5.3+dfsg.orig/man/Makefile.in
++++ blt-2.5.3+dfsg/man/Makefile.in
@@ -52,7 +52,7 @@
: ; \
else \
@@ -129,8 +144,10 @@
fi ; \
done
---- a/library/Makefile.in
-+++ b/library/Makefile.in
+Index: blt-2.5.3+dfsg/library/Makefile.in
+===================================================================
+--- blt-2.5.3+dfsg.orig/library/Makefile.in
++++ blt-2.5.3+dfsg/library/Makefile.in
@@ -61,7 +61,7 @@
for i in $(miscFiles) ; do \
$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
@@ -149,8 +166,10 @@
fi ; \
done
---- a/generic/bltOldConfig.h
-+++ b/generic/bltOldConfig.h
+Index: blt-2.5.3+dfsg/generic/bltOldConfig.h
+===================================================================
+--- blt-2.5.3+dfsg.orig/generic/bltOldConfig.h
++++ blt-2.5.3+dfsg/generic/bltOldConfig.h
@@ -1,5 +1,7 @@
/* Old config headers. */
Modified: blt/trunk/debian/patches/ldflags.patch
===================================================================
--- blt/trunk/debian/patches/ldflags.patch 2015-11-25 08:34:10 UTC (rev 1754)
+++ blt/trunk/debian/patches/ldflags.patch 2015-11-25 08:48:30 UTC (rev 1755)
@@ -4,34 +4,6 @@
Author: Sergei Golovan
Last-Modified: Fri, 04 Jul 2014 09:29:39 +0400
---- a/configure
-+++ b/configure
-@@ -3859,7 +3859,7 @@
- SHLIB_LIB_SPECS="${JPEG_LIB_SPEC}"
- SHLIB_TCL_ONLY_LIB_SPECS="${TCL_ONLY_LIB_SPECS}"
- SHLIB_TCL_ONLY_LIB_SPECS=""
--LDFLAGS=""
-+LDFLAGS="${LDFLAGS}"
- LD_RUN_PATH=""
- EXTRA_LIB_SPECS=""
-
-@@ -4035,13 +4035,13 @@
- fi
- ;;
-
-- *-linux*)
-+ *-linux*|*-gnu*)
- SHLIB_CFLAGS="-fPIC"
- SHLIB_LD="${CC}"
- SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
-- LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
-+ LD_RUN_PATH=""
-
-- LDFLAGS=""
-+ LDFLAGS="${LDFLAGS}"
- EXTRA_LIB_SPECS="-ldl"
- ;;
-
--- a/configure.in
+++ b/configure.in
@@ -1061,7 +1061,7 @@
Modified: blt/trunk/debian/patches/pkgindex.patch
===================================================================
--- blt/trunk/debian/patches/pkgindex.patch 2015-11-25 08:34:10 UTC (rev 1754)
+++ blt/trunk/debian/patches/pkgindex.patch 2015-11-25 08:48:30 UTC (rev 1755)
@@ -5,43 +5,13 @@
package is installed). Also, it skips initializing widget bindings
if Tk isn't present.
Author: Sergei Golovan
-Last-Modified: Fri, 04 Jul 2014 09:27:54 +0400
+Author: Steve Langasek <vorlon at debian.org>
+Last-Modified: Mon, 31 Aug 2015 12:09:00 -0700
---- a/configure
-+++ b/configure
-@@ -3757,6 +3757,22 @@
-
- BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION}
-
-+echo $ac_n "checking BLT_PATCH_LEVEL""... $ac_c" 1>&6
-+echo "configure:3742: checking BLT_PATCH_LEVEL" >&5
-+if eval "test \"`echo '$''{'blt_cv_patch_level'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.awk <<EOF
-+/^# *define *BLT_PATCH_LEVEL[ \t]/ { print \$3 }
-+EOF
-+blt_cv_patch_level=`${AWK} -f conftest.awk ${srcdir}/generic/blt.h`
-+rm -rf conftest*
-+
-+fi
-+
-+echo "$ac_t""$blt_cv_patch_level" 1>&6
-+BLT_PATCH_LEVEL=${blt_cv_patch_level}
-+
- # Add BLT to the run path
- libdir=${exec_prefix}/lib
-
-@@ -4448,6 +4464,7 @@
- s%@BLT_MAJOR_VERSION@%$BLT_MAJOR_VERSION%g
- s%@BLT_MINOR_VERSION@%$BLT_MINOR_VERSION%g
- s%@BLT_VERSION@%$BLT_VERSION%g
-+s%@BLT_PATCH_LEVEL@%$BLT_PATCH_LEVEL%g
- s%@AUX_LIBS@%$AUX_LIBS%g
- s%@TCL_LIB_DIR@%$TCL_LIB_DIR%g
- s%@TCL_VERSION@%$TCL_VERSION%g
---- a/library/Makefile.in
-+++ b/library/Makefile.in
+Index: blt-2.5.3+dfsg/library/Makefile.in
+===================================================================
+--- blt-2.5.3+dfsg.orig/library/Makefile.in
++++ blt-2.5.3+dfsg/library/Makefile.in
@@ -5,6 +5,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -58,8 +28,10 @@
sed -e 's/%LIB_PREFIX%/$(lib_prefix)/' | \
sed -e 's;%LIB_DIR%;$(libdir);' > pkgIndex.tcl
---- a/library/pkgIndex.tcl.in
-+++ b/library/pkgIndex.tcl.in
+Index: blt-2.5.3+dfsg/library/pkgIndex.tcl.in
+===================================================================
+--- blt-2.5.3+dfsg.orig/library/pkgIndex.tcl.in
++++ blt-2.5.3+dfsg/library/pkgIndex.tcl.in
@@ -49,11 +49,13 @@
}
if { ![file exists $library] } continue
@@ -75,8 +47,10 @@
+package ifneeded BLT $patchlevel [list LoadBLT25 $version $dir]
# End of package index file
---- a/library/init.tcl
-+++ b/library/init.tcl
+Index: blt-2.5.3+dfsg/library/init.tcl
+===================================================================
+--- blt-2.5.3+dfsg.orig/library/init.tcl
++++ blt-2.5.3+dfsg/library/init.tcl
@@ -8,7 +8,9 @@
}
}
@@ -88,3 +62,29 @@
}
+Index: blt-2.5.3+dfsg/configure.in
+===================================================================
+--- blt-2.5.3+dfsg.orig/configure.in
++++ blt-2.5.3+dfsg/configure.in
+@@ -977,6 +977,13 @@
+
+ BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION}
+
++AC_MSG_CHECKING([BLT_PATCH_LEVEL])
++AC_CACHE_VAL(blt_cv_patch_level,
++AC_GREP_SYMBOL(blt_cv_patch_level, BLT_PATCH_LEVEL, ${srcdir}/generic/blt.h)
++)
++AC_MSG_RESULT([$blt_cv_patch_level])
++BLT_PATCH_LEVEL=${blt_cv_patch_level}
++
+ # Add BLT to the run path
+ libdir=${exec_prefix}/lib
+
+@@ -1386,6 +1393,7 @@
+ AC_SUBST(DEFINES)
+ AC_SUBST(BLT_MAJOR_VERSION)
+ AC_SUBST(BLT_MINOR_VERSION)
++AC_SUBST(BLT_PATCH_LEVEL)
+ AC_SUBST(BLT_VERSION)
+ AC_SUBST(AUX_LIBS)
+ AC_SUBST(TCL_LIB_DIR)
Modified: blt/trunk/debian/patches/series
===================================================================
--- blt/trunk/debian/patches/series 2015-11-25 08:34:10 UTC (rev 1754)
+++ blt/trunk/debian/patches/series 2015-11-25 08:48:30 UTC (rev 1755)
@@ -18,4 +18,4 @@
uninitialized.patch
unused.patch
pointertoint.patch
-distclean.patch
+autoreconf.patch
Modified: blt/trunk/debian/patches/usetclint.patch
===================================================================
--- blt/trunk/debian/patches/usetclint.patch 2015-11-25 08:34:10 UTC (rev 1754)
+++ blt/trunk/debian/patches/usetclint.patch 2015-11-25 08:48:30 UTC (rev 1755)
@@ -14,16 +14,6 @@
/* Namespace related routines */
---- a/configure
-+++ b/configure
-@@ -3493,6 +3493,7 @@
- "${TCL_INC_DIR}" != "${TK_INC_DIR}" ; then
- INC_SPECS="${INC_SPECS} -I${TCL_INC_DIR}"
- fi
-+INC_SPECS="${INC_SPECS} -I${TCL_SRC_DIR}/generic -I${TCL_SRC_DIR}/unix"
-
-
- # On Windows, override the default include directory with our own.
--- a/configure.in
+++ b/configure.in
@@ -825,6 +825,7 @@
Modified: blt/trunk/debian/patches/usetkint.patch
===================================================================
--- blt/trunk/debian/patches/usetkint.patch 2015-11-25 08:34:10 UTC (rev 1754)
+++ blt/trunk/debian/patches/usetkint.patch 2015-11-25 08:48:30 UTC (rev 1755)
@@ -1397,16 +1397,6 @@
TkpMenuNotifyToplevelCreate(framePtr->interp, framePtr->menuName);
}
#endif /* TK_MAJOR_VERSION > 4 */
---- a/configure
-+++ b/configure
-@@ -3484,6 +3484,7 @@
- if test "${TK_INC_DIR}" != "/usr/include" ; then
- INC_SPECS="${INC_SPECS} -I${TK_INC_DIR}"
- fi
-+INC_SPECS="${INC_SPECS} -I${TK_SRC_DIR}/generic -I${TK_SRC_DIR}/unix"
-
- # Tcl include files
- #
--- a/configure.in
+++ b/configure.in
@@ -816,6 +816,7 @@
Modified: blt/trunk/debian/rules
===================================================================
--- blt/trunk/debian/rules 2015-11-25 08:34:10 UTC (rev 1754)
+++ blt/trunk/debian/rules 2015-11-25 08:48:30 UTC (rev 1755)
@@ -11,19 +11,14 @@
dtmp = $(shell pwd)/debian/tmp
%:
- dh $@
+ dh $@ --with autoreconf
override_dh_auto_configure:
- dh_autotools-dev_updateconfig
dh_auto_configure -- \
--host=$(DEB_HOST_GNU_TYPE) \
--with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(tclv) \
--with-tk=/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(tclv)
-override_dh_clean:
- [ ! -f Makefile ] || $(MAKE) clean
- [ ! -f Makefile ] || $(MAKE) distclean
-
override_dh_auto_build:
$(MAKE) lib_so=$(lib_so) \
tcl_only_lib_so=$(tcl_only_lib_so)
@@ -83,6 +78,6 @@
tar -Jcf $$CURDIR/blt_$(v).3+dfsg.orig.tar.xz blt$(v) && \
rm -rf $$TMPDIR
-.PHONY: override_dh_auto_configure override_dh_clean override_dh_auto_build \
+.PHONY: override_dh_auto_configure override_dh_auto_build \
override_dh_auto_install override_dh_makeshlibs override_dh_installdocs \
get-orig-source
More information about the Pkg-tcltk-commits
mailing list