[Pkg-tcltk-commits] r1595 - in tclreadline/trunk/debian: . patches source

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Thu Mar 20 10:22:10 UTC 2014 

Author: sgolovan
Date: 2014-03-20 10:22:10 +0000 (Thu, 20 Mar 2014)
New Revision: 1595

Added:
   tclreadline/trunk/debian/dirs
   tclreadline/trunk/debian/docs
   tclreadline/trunk/debian/lintian-overrides
   tclreadline/trunk/debian/patches/functions.patch
   tclreadline/trunk/debian/source/lintian-overrides
Removed:
   tclreadline/trunk/debian/source.lintian-overrides
   tclreadline/trunk/debian/tcl-tclreadline.dirs
   tclreadline/trunk/debian/tcl-tclreadline.docs
   tclreadline/trunk/debian/tcl-tclreadline.lintian-overrides
Modified:
   tclreadline/trunk/debian/changelog
   tclreadline/trunk/debian/compat
   tclreadline/trunk/debian/control
   tclreadline/trunk/debian/patches/series
   tclreadline/trunk/debian/patches/tclrldir.patch
   tclreadline/trunk/debian/rules
Log:
[tclreadline]
  * Multiarchified the package.
  * Bumped debhelper compatibility version to 9.
  * Bumped standards version to 3.9.5.
  * Fixed building against the newer libreadline6 (closes: #741763).


Modified: tclreadline/trunk/debian/changelog
===================================================================
--- tclreadline/trunk/debian/changelog	2014-03-08 09:39:30 UTC (rev 1594)
+++ tclreadline/trunk/debian/changelog	2014-03-20 10:22:10 UTC (rev 1595)
@@ -1,8 +1,11 @@
-tclreadline (2.1.0-13) UNRELEASED; urgency=low
+tclreadline (2.1.0-13) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Multiarchified the package.
+  * Bumped debhelper compatibility version to 9.
+  * Bumped standards version to 3.9.5.
+  * Fixed building against the newer libreadline6 (closes: #741763).
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 27 May 2012 22:55:38 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 20 Mar 2014 14:19:41 +0400
 
 tclreadline (2.1.0-12) unstable; urgency=low
 

Modified: tclreadline/trunk/debian/compat
===================================================================
--- tclreadline/trunk/debian/compat	2014-03-08 09:39:30 UTC (rev 1594)
+++ tclreadline/trunk/debian/compat	2014-03-20 10:22:10 UTC (rev 1595)
@@ -1 +1 @@
-8
+9

Modified: tclreadline/trunk/debian/control
===================================================================
--- tclreadline/trunk/debian/control	2014-03-08 09:39:30 UTC (rev 1594)
+++ tclreadline/trunk/debian/control	2014-03-20 10:22:10 UTC (rev 1595)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~), tcl-dev, libreadline-dev, autotools-dev
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), tcl-dev (>= 8.6.0+2), libreadline-dev, autotools-dev
+Standards-Version: 3.9.5
 Homepage: http://tclreadline.sourceforge.net/
 
 Package: tcl-tclreadline
@@ -15,6 +15,7 @@
 Replaces: tclreadline
 Conflicts: tclreadline
 Provides: tclreadline
+Multi-Arch: same
 Description: GNU Readline Extension for Tcl/Tk
  tclreadline adds GNU Readline support to standard Tcl/Tk.  It provides
  interactive command editing and history for Tcl shells (this must be

Copied: tclreadline/trunk/debian/dirs (from rev 1235, tclreadline/trunk/debian/tcl-tclreadline.dirs)
===================================================================
--- tclreadline/trunk/debian/dirs	                        (rev 0)
+++ tclreadline/trunk/debian/dirs	2014-03-20 10:22:10 UTC (rev 1595)
@@ -0,0 +1 @@
+usr/share/man/man3

Copied: tclreadline/trunk/debian/docs (from rev 1234, tclreadline/trunk/debian/docs)
===================================================================
--- tclreadline/trunk/debian/docs	                        (rev 0)
+++ tclreadline/trunk/debian/docs	2014-03-20 10:22:10 UTC (rev 1595)
@@ -0,0 +1,2 @@
+AUTHORS
+README

Copied: tclreadline/trunk/debian/lintian-overrides (from rev 1234, tclreadline/trunk/debian/lintian-overrides)
===================================================================
--- tclreadline/trunk/debian/lintian-overrides	                        (rev 0)
+++ tclreadline/trunk/debian/lintian-overrides	2014-03-20 10:22:10 UTC (rev 1595)
@@ -0,0 +1 @@
+tclreadline: package-name-doesnt-match-sonames

Added: tclreadline/trunk/debian/patches/functions.patch
===================================================================
--- tclreadline/trunk/debian/patches/functions.patch	                        (rev 0)
+++ tclreadline/trunk/debian/patches/functions.patch	2014-03-20 10:22:10 UTC (rev 1595)
@@ -0,0 +1,20 @@
+--- a/tclreadline.c
++++ b/tclreadline.c
+@@ -620,7 +620,7 @@
+        = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ 
+        rl_filename_quoting_function
+-       = (CPFunction*) TclReadlineFilenameQuotingFunction;
++       = (rl_quote_func_t *) TclReadlineFilenameQuotingFunction;
+      */
+     /*
+        rl_filename_quoting_desired = 1;
+@@ -635,7 +635,7 @@
+      * directory. If this failes, this
+      * is *not* an error.
+      */
+-    rl_attempted_completion_function = (CPPFunction *) TclReadlineCompletion;
++    rl_attempted_completion_function = (rl_completion_func_t *) TclReadlineCompletion;
+     if (read_history(historyfile)) {
+ 	if (write_history(historyfile)) {
+ 	    Tcl_AppendResult (interp, "warning: `",

Modified: tclreadline/trunk/debian/patches/series
===================================================================
--- tclreadline/trunk/debian/patches/series	2014-03-08 09:39:30 UTC (rev 1594)
+++ tclreadline/trunk/debian/patches/series	2014-03-20 10:22:10 UTC (rev 1595)
@@ -9,3 +9,4 @@
 kfreebsd.patch
 tinfo.patch
 link.patch
+functions.patch

Modified: tclreadline/trunk/debian/patches/tclrldir.patch
===================================================================
--- tclreadline/trunk/debian/patches/tclrldir.patch	2014-03-08 09:39:30 UTC (rev 1594)
+++ tclreadline/trunk/debian/patches/tclrldir.patch	2014-03-20 10:22:10 UTC (rev 1595)
@@ -3,12 +3,15 @@
 ===================================================================
 --- tclreadline-2.1.0.orig/configure
 +++ tclreadline-2.1.0/configure
-@@ -1862,7 +1862,7 @@
+@@ -1860,9 +1860,9 @@
+ if test "${prefix}" = "NONE"; then
+     prefix=$TCL_PREFIX
  fi
- TCLRL_LIBDIR="${prefix}/lib"
+-TCLRL_LIBDIR="${prefix}/lib"
++TCLRL_LIBDIR="${prefix}/lib/${DEB_HOST_MULTIARCH}"
  
 -TCLRL_DIR="${TCLRL_LIBDIR}/tclreadline$VERSION"
-+TCLRL_DIR="/usr/share/tcltk/tclreadline$VERSION"
++TCLRL_DIR="${prefix}/lib/tcltk/${DEB_HOST_MULTIARCH}/tclreadline$VERSION"
  
  
  # HEADERS
@@ -16,12 +19,15 @@
 ===================================================================
 --- tclreadline-2.1.0.orig/configure.in
 +++ tclreadline-2.1.0/configure.in
-@@ -91,7 +91,7 @@
+@@ -89,9 +89,9 @@
+ if test "${prefix}" = "NONE"; then
+     prefix=$TCL_PREFIX
  fi
- TCLRL_LIBDIR="${prefix}/lib"
+-TCLRL_LIBDIR="${prefix}/lib"
++TCLRL_LIBDIR="${prefix}/lib/${DEB_HOST_MULTIARCH}"
  AC_SUBST(TCLRL_LIBDIR)
 -TCLRL_DIR="${TCLRL_LIBDIR}/tclreadline$VERSION"
-+TCLRL_DIR="/usr/share/tcltk/tclreadline$VERSION"
++TCLRL_DIR="${prefix}/lib/tcltk/${DEB_HOST_MULTIARCH}/tclreadline$VERSION"
  AC_SUBST(TCLRL_DIR)
  
  # HEADERS

Modified: tclreadline/trunk/debian/rules
===================================================================
--- tclreadline/trunk/debian/rules	2014-03-08 09:39:30 UTC (rev 1594)
+++ tclreadline/trunk/debian/rules	2014-03-20 10:22:10 UTC (rev 1595)
@@ -4,6 +4,7 @@
 
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/architecture.mk
 
 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 export LDFLAGS
@@ -31,11 +32,14 @@
 
 override_dh_auto_install:
 	dh_auto_install
+	# Fix up the architecture dependent include
+	install -m 755 -d $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH)
+	mv $(DESTDIR)/usr/include/*.h $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH)
 	# Fix up the manpage
 	mv $(DESTDIR)/usr/share/man/mann/tclreadline.n \
 	   $(DESTDIR)/usr/share/man/man3/tclreadline.3tcl
 	# Remove .la file
-	rm $(DESTDIR)/usr/lib/*.la
+	rm $(DESTDIR)/usr/lib/*/*.la
 	# Remove empty directories
 	find $(DESTDIR) -empty -prune -exec rmdir \{\} \;
 

Copied: tclreadline/trunk/debian/source/lintian-overrides (from rev 1234, tclreadline/trunk/debian/source.lintian-overrides)
===================================================================
--- tclreadline/trunk/debian/source/lintian-overrides	                        (rev 0)
+++ tclreadline/trunk/debian/source/lintian-overrides	2014-03-20 10:22:10 UTC (rev 1595)
@@ -0,0 +1 @@
+tclreadline source: ancient-libtool

Deleted: tclreadline/trunk/debian/source.lintian-overrides
===================================================================
--- tclreadline/trunk/debian/source.lintian-overrides	2014-03-08 09:39:30 UTC (rev 1594)
+++ tclreadline/trunk/debian/source.lintian-overrides	2014-03-20 10:22:10 UTC (rev 1595)
@@ -1 +0,0 @@
-tclreadline source: ancient-libtool

Deleted: tclreadline/trunk/debian/tcl-tclreadline.dirs
===================================================================
--- tclreadline/trunk/debian/tcl-tclreadline.dirs	2014-03-08 09:39:30 UTC (rev 1594)
+++ tclreadline/trunk/debian/tcl-tclreadline.dirs	2014-03-20 10:22:10 UTC (rev 1595)
@@ -1 +0,0 @@
-usr/share/man/man3

Deleted: tclreadline/trunk/debian/tcl-tclreadline.docs
===================================================================
--- tclreadline/trunk/debian/tcl-tclreadline.docs	2014-03-08 09:39:30 UTC (rev 1594)
+++ tclreadline/trunk/debian/tcl-tclreadline.docs	2014-03-20 10:22:10 UTC (rev 1595)
@@ -1,2 +0,0 @@
-AUTHORS
-README

Deleted: tclreadline/trunk/debian/tcl-tclreadline.lintian-overrides
===================================================================
--- tclreadline/trunk/debian/tcl-tclreadline.lintian-overrides	2014-03-08 09:39:30 UTC (rev 1594)
+++ tclreadline/trunk/debian/tcl-tclreadline.lintian-overrides	2014-03-20 10:22:10 UTC (rev 1595)
@@ -1 +0,0 @@
-tcl-tclreadline: package-name-doesnt-match-sonames

More information about the Pkg-tcltk-commits mailing list