[Pkg-tcltk-commits] r408 - in tclex/trunk: . debian debian/patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Fri Nov 30 18:28:13 UTC 2007
Author: sgolovan-guest
Date: 2007-11-30 18:28:12 +0000 (Fri, 30 Nov 2007)
New Revision: 408
Added:
tclex/trunk/debian/patches/
tclex/trunk/debian/patches/flags.diff
tclex/trunk/debian/patches/series
tclex/trunk/debian/patches/types.diff
Removed:
tclex/trunk/src/
Modified:
tclex/trunk/debian/changelog
tclex/trunk/debian/compat
tclex/trunk/debian/control
tclex/trunk/debian/dirs
tclex/trunk/debian/rules
Log:
[tclex]
* New maintainer Debian Tcl/Tk Packagers
<pkg-tcltk-devel at lists.alioth.debian.org> (closes: #406135).
* Adopted the package to the current Debian Tcl/Tk policy. This also fixed
FTBFS (closes: #450474).
* Fixed lintian complain on ignoring make distclean errors.
* Switched to quilt for patch management.
* Bumped debhelper compatibility level to 5.
Modified: tclex/trunk/debian/changelog
===================================================================
--- tclex/trunk/debian/changelog 2007-11-30 17:41:48 UTC (rev 407)
+++ tclex/trunk/debian/changelog 2007-11-30 18:28:12 UTC (rev 408)
@@ -1,3 +1,15 @@
+tclex (1.2a1-12) unstable; urgency=low
+
+ * New maintainer Debian Tcl/Tk Packagers
+ <pkg-tcltk-devel at lists.alioth.debian.org> (closes: #406135).
+ * Adopted the package to the current Debian Tcl/Tk policy. This also fixed
+ FTBFS (closes: #450474).
+ * Fixed lintian complain on ignoring make distclean errors.
+ * Switched to quilt for patch management.
+ * Bumped debhelper compatibility level to 5.
+
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 30 Nov 2007 20:41:40 +0300
+
tclex (1.2a1-11) unstable; urgency=low
* QA upload.
Modified: tclex/trunk/debian/compat
===================================================================
--- tclex/trunk/debian/compat 2007-11-30 17:41:48 UTC (rev 407)
+++ tclex/trunk/debian/compat 2007-11-30 18:28:12 UTC (rev 408)
@@ -1 +1 @@
-4
+5
Modified: tclex/trunk/debian/control
===================================================================
--- tclex/trunk/debian/control 2007-11-30 17:41:48 UTC (rev 407)
+++ tclex/trunk/debian/control 2007-11-30 18:28:12 UTC (rev 408)
@@ -1,13 +1,14 @@
Source: tclex
Section: interpreters
Priority: extra
-Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: tcl8.4-dev, debhelper (>= 4.0.0)
+Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
+Uploaders: Sergei Golovan <sgolovan at debian.org>
+Build-Depends: tcl-dev, debhelper (>= 5.0.0), quilt
Standards-Version: 3.7.2
Package: tclex
Architecture: any
-Depends: tcl8.3, ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${tclsh:Depends}
Description: A lexical analyzer generator for Tcl
tcLex is a lexer (lexical analyzer) generator extension to Tcl. It is
inspired by Unix and GNU lex and flex, which are "tools for
Modified: tclex/trunk/debian/dirs
===================================================================
--- tclex/trunk/debian/dirs 2007-11-30 17:41:48 UTC (rev 407)
+++ tclex/trunk/debian/dirs 2007-11-30 18:28:12 UTC (rev 408)
@@ -1,2 +1,2 @@
-usr/lib/tcLex1.2
+usr/lib/tcltk
usr/share/doc/tclex/html
Added: tclex/trunk/debian/patches/flags.diff
===================================================================
--- tclex/trunk/debian/patches/flags.diff (rev 0)
+++ tclex/trunk/debian/patches/flags.diff 2007-11-30 18:28:12 UTC (rev 408)
@@ -0,0 +1,15 @@
+
+--- tclex-1.2a1.orig/src/tcLex.c
++++ tclex-1.2a1/src/tcLex.c
+@@ -1145,7 +1145,11 @@
+
+ currentLexer = LexerGetCurrent(interp);
+ if (currentLexer) {
++#ifdef CMD_IS_DELETED
++ if (((Command*)currentLexer->command)->flags & CMD_IS_DELETED)
++#else
+ if (((Command*)currentLexer->command)->deleted)
++#endif
+ /* If command has been deleted, the token is meaningless. Return no result */
+ Tcl_ResetResult(interp);
+ else
Added: tclex/trunk/debian/patches/series
===================================================================
--- tclex/trunk/debian/patches/series (rev 0)
+++ tclex/trunk/debian/patches/series 2007-11-30 18:28:12 UTC (rev 408)
@@ -0,0 +1,2 @@
+types.diff
+flags.diff
Added: tclex/trunk/debian/patches/types.diff
===================================================================
--- tclex/trunk/debian/patches/types.diff (rev 0)
+++ tclex/trunk/debian/patches/types.diff 2007-11-30 18:28:12 UTC (rev 408)
@@ -0,0 +1,75 @@
+
+--- tclex-1.2a1.orig/src/tcLex.c
++++ tclex-1.2a1/src/tcLex.c
+@@ -1194,7 +1198,7 @@
+ Tcl_Obj *CONST objv[];
+ int start;
+ {
+- static char * options[] = {
++ static const char * options[] = {
+ "-inclusiveconditions", "-ic",
+ "-exclusiveconditions", "-ec",
+ "-resultvariable",
+@@ -1271,7 +1275,7 @@
+ * Get the switch
+ */
+
+- if (Tcl_GetIndexFromObj(interp, objv[i], options, "switch", 0, &optionIndex) == TCL_ERROR)
++ if (Tcl_GetIndexFromObj(interp, objv[i], options, "switch", 0, (int *) &optionIndex) == TCL_ERROR)
+ return TCL_ERROR;
+
+ switch (optionIndex) {
+@@ -1444,7 +1448,7 @@
+ int objc;
+ Tcl_Obj *CONST objv[];
+ {
+- static char * options[] = {
++ static const char * options[] = {
+ "create", "current",
+ NULL
+ };
+@@ -1469,7 +1473,7 @@
+ * Get the switch
+ */
+
+- if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, &optionIndex) == TCL_ERROR) {
++ if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, (int *) &optionIndex) == TCL_ERROR) {
+ /*
+ * For now, an unknown subcommand is interpreted as the name of a new lexer
+ * to create. This is for compatibility issues, and is likely to change when
+@@ -2533,7 +2537,7 @@
+ {
+ TcLex_Lexer *lexer = (TcLex_Lexer *)clientData;
+ TcLex_State *statePtr = lexer->states[lexer->curState];
+- static char *options[] = {
++ static const char *options[] = {
+ "-current",
+ NULL};
+ static enum {
+@@ -2562,7 +2566,7 @@
+ * Switch to distinct subfunctions depending on the option
+ */
+
+- if (Tcl_GetIndexFromObj(interp, objv[2], options, "option", 0, &optionIndex) == TCL_ERROR)
++ if (Tcl_GetIndexFromObj(interp, objv[2], options, "option", 0, (int *) &optionIndex) == TCL_ERROR)
+ return TCL_ERROR;
+
+ switch (optionIndex) {
+@@ -2896,7 +2900,7 @@
+ Tcl_Obj *CONST objv[];
+ {
+ TcLex_Lexer *lexer = (TcLex_Lexer *)clientData;
+- static char *options[] = {
++ static const char *options[] = {
+ "eval", "start", "continue", "finish",
+ "begin", "end",
+ "conditions", "reject",
+@@ -2935,7 +2939,7 @@
+ * Get the subcommand
+ */
+
+- if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, &optionIndex) == TCL_ERROR)
++ if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, (int *) &optionIndex) == TCL_ERROR)
+ return TCL_ERROR;
+
+ /*
Modified: tclex/trunk/debian/rules
===================================================================
--- tclex/trunk/debian/rules 2007-11-30 17:41:48 UTC (rev 407)
+++ tclex/trunk/debian/rules 2007-11-30 18:28:12 UTC (rev 408)
@@ -2,20 +2,36 @@
# Made with the aid of debmake, by Christoph Lameter,
# based on the sample debian/rules file for GNU hello by Ian Jackson.
+export QUILT_PATCHES := debian/patches
+
package=tclex
+unpatch:
+ dh_testdir
+ -quilt pop -a
+ rm -rf patch-stamp .pc
+
+patch: patch-stamp
+patch-stamp:
+ dh_testdir
+ quilt push -a
+ touch patch-stamp
+
build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
dh_testdir
- cd src; chmod +x configure; ./configure;
- $(MAKE) -C src
+ cd src; \
+ chmod +x configure; \
+ ./configure --prefix=/usr
+ $(MAKE) -C src
touch build-stamp
-clean:
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
-rm -f build-stamp
- -$(MAKE) -C src distclean
+ [ ! -f src/Makefile ] || $(MAKE) -C src distclean
-rm -f src/*.so
-rm -f `find . -name "*~"`
-rm -rf debian/tclex debian/files* core debian/substvars
@@ -26,8 +42,10 @@
dh_testroot
dh_clean -k
dh_installdirs
+ $(MAKE) -C src install TCL_PREFIX=../debian/tclex/usr
+ mv debian/tclex/usr/lib/tcLex* debian/tclex/usr/lib/tcltk/
-binary-indep: build install
+binary-indep: build install
# There are no architecture-independent files to be uploaded
# generated by this package. If there were any they would be
# made here.
@@ -38,10 +56,10 @@
dh_installchangelogs changes.txt
dh_installdocs README.txt
dh_installexamples
- $(MAKE) -C src install TCL_PREFIX=../debian/tclex/usr
# be an irritating wise-a** and change .htm in .html where possible
for a in `cd doc/en; ls *.htm`; do \
- cat doc/en/$$a | perl -pe 's/("\w+)\.htm\b/\1.html/g' > debian/tclex/usr/share/doc/$(package)/html/$${a}l; \
+ cat doc/en/$$a | perl -pe 's/("\w+)\.htm\b/\1.html/g' \
+ >debian/tclex/usr/share/doc/$(package)/html/$${a}l; \
done
dh_installman
dh_link
@@ -50,7 +68,8 @@
dh_fixperms
# dh_makeshlibs
dh_installdeb
- dh_shlibdeps
+ dh_shlibdeps
+ tcltk-depends
dh_gencontrol
dh_md5sums
dh_builddeb
@@ -58,4 +77,4 @@
binary: binary-indep binary-arch
-.PHONY: binary binary-arch binary-indep clean
+.PHONY: patch unpatch clean-patched binary binary-arch binary-indep clean
More information about the Pkg-tcltk-commits
mailing list