Tags 459176 +pending Tags 438107 +pending Thanks Hi!
I have prepared an NMU that applies the provided patch and also gives some
love to the package in general. This is the changelog of the package I
have done:
tclx8.3 (8.3.5-6.1) unstable; urgency=low
* Non-maintainer upload to fix build problem with dash as sh.
* Removed bashism from debian/rules. Thanks to Xavier Bassery for the
patch. Closes: #459176
* Made sure that files are correctly stripped or not stripped.
Closes: #438107
* Updated debhelper compat level to 5 (3 is deprecated).
* Replaced obsolete xlibs-dev and x-dev with x11proto-core-dev.
* Updated Standards-Version to 3.7.3
+ Replaced deprecated "Apps" section with "Applications" in menu files.
+ Replaced deprecated {Source-Version} with {binary:Version}.
-- Margarita Manterola <[EMAIL PROTECTED]> Wed, 12 Mar 2008 01:07:18 +0000
Since this is quite a big change, I'll be uploading to the 7-day delayed queue.
The debdiff output comparing with the current package in Debian is attached.
--
Love,
Marga.
diff -u tclx8.3-8.3.5/debian/rules tclx8.3-8.3.5/debian/rules
--- tclx8.3-8.3.5/debian/rules
+++ tclx8.3-8.3.5/debian/rules
@@ -9,9 +9,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-
VERSION = $(shell head -1 debian/changelog | sed 's/ .*//;s/tclx//')
SRC_VERSION = $(shell head -1 debian/changelog | sed 's/.*(//;s/).*//;s/-.*//')
PKG_VERSION = $(shell head -1 debian/changelog | sed 's/.*(//;s/).*//')
@@ -23,8 +20,11 @@
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
+
+# Manage stripping or no-stripping as appropiate.
+STRIP = "strip"
+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ STRIP = "true"
endif
configure: configure-stamp
@@ -36,10 +36,12 @@
--with-tclconfig=$(TCL_CONFIG) --with-tkconfig=$(TK_CONFIG)
# Fix versions in installation scripts
- for f in debian/dirs debian/*.*{inst,rm,menu}; do \
- perl -pi -e 's/8\.[0-9]/$(VERSION)/g' $$f; \
- perl -pi -e 's/^PRIORITY=.*/PRIORITY=$(PRIORITY)/' $$f; \
- done
+ # This doesn't work in dash, and is superflous,
+ # thus, it's commented out.
+# for f in debian/dirs debian/*.*{inst,rm,menu}; do \
+# perl -pi -e 's/8\.[0-9]/$(VERSION)/g' $$f; \
+# perl -pi -e 's/^PRIORITY=.*/PRIORITY=$(PRIORITY)/' $$f; \
+# done
touch configure-stamp
@@ -94,7 +96,7 @@
TCLX_INST_MAN=/usr/share/man \
TCL_MAN_DIR=`pwd`/../debian/tmp/tcl-man \
TK_MAN_DIR=`pwd`/../debian/tmp/tk-man \
- install
+ STRIP=$(STRIP) install
-rm -rf debian/tmp
# Fix up the binaries.
diff -u tclx8.3-8.3.5/debian/changelog tclx8.3-8.3.5/debian/changelog
--- tclx8.3-8.3.5/debian/changelog
+++ tclx8.3-8.3.5/debian/changelog
@@ -1,3 +1,18 @@
+tclx8.3 (8.3.5-6.1) unstable; urgency=low
+
+ * Non-maintainer upload to fix build problem with dash as sh.
+ * Removed bashism from debian/rules. Thanks to Xavier Bassery for the
+ patch. Closes: #459176
+ * Made sure that files are correctly stripped or not stripped.
+ Closes: #438107
+ * Updated debhelper compat level to 5 (3 is deprecated).
+ * Replaced obsolete xlibs-dev and x-dev with x11proto-core-dev.
+ * Updated Standards-Version to 3.7.3
+ + Replaced deprecated "Apps" section with "Applications" in menu files.
+ + Replaced deprecated {Source-Version} with {binary:Version}.
+
+ -- Margarita Manterola <[EMAIL PROTECTED]> Wed, 12 Mar 2008 01:07:18 +0000
+
tclx8.3 (8.3.5-6) unstable; urgency=low
* Fixed typo in unix/configure.
diff -u tclx8.3-8.3.5/debian/tclx8.3.menu tclx8.3-8.3.5/debian/tclx8.3.menu
--- tclx8.3-8.3.5/debian/tclx8.3.menu
+++ tclx8.3-8.3.5/debian/tclx8.3.menu
@@ -1,2 +1,2 @@
-?package(tclx8.3):needs="text" section="Apps/Programming" \
+?package(tclx8.3):needs="text" section="Applications/Programming" \
title="Tcl8.3" command="/usr/bin/tcl8.3"
diff -u tclx8.3-8.3.5/debian/control tclx8.3-8.3.5/debian/control
--- tclx8.3-8.3.5/debian/control
+++ tclx8.3-8.3.5/debian/control
@@ -2,8 +2,8 @@
Section: libs
Priority: optional
Maintainer: Massimo Dal Zotto <[EMAIL PROTECTED]>
-Standards-Version: 3.5.2
-Build-Depends: tcl8.3-dev (>= 8.3.2-8), tk8.3-dev (>= 8.3.2-4), tcl8.3-doc, tk8.3-doc, x-dev | xlibs-dev | xlib6g-dev, debhelper (>= 3.0.0), groff, bsdmainutils, perl
+Standards-Version: 3.7.3
+Build-Depends: tcl8.3-dev (>= 8.3.2-8), tk8.3-dev (>= 8.3.2-4), tcl8.3-doc, tk8.3-doc, x11proto-core-dev | xlib6g-dev, debhelper (>= 5.0.0), groff, bsdmainutils, perl
Package: tclx8.3
Section: libs
@@ -41,7 +41,7 @@
Package: tclx8.3-dev
Section: devel
Architecture: any
-Depends: tclx8.3 (= ${Source-Version}), tcl8.3-dev
+Depends: tclx8.3 (= ${binary:Version}), tcl8.3-dev
Suggests: tclx8.3-doc
Conflicts: tclx-dev
Description: Extended Tcl (TclX) version 8.3.5 -- TclX development package
@@ -55,7 +55,7 @@
Package: tkx8.3-dev
Section: devel
Architecture: any
-Depends: tkx8.3 (= ${Source-Version}), tk8.3-dev
+Depends: tkx8.3 (= ${binary:Version}), tk8.3-dev
Suggests: tkx8.3-doc
Conflicts: tclx-dev
Description: Extended Tcl (TclX) version 8.3.5 -- TkX development package
diff -u tclx8.3-8.3.5/debian/fix-hardlinks tclx8.3-8.3.5/debian/fix-hardlinks
--- tclx8.3-8.3.5/debian/fix-hardlinks
+++ tclx8.3-8.3.5/debian/fix-hardlinks
@@ -7,10 +7,10 @@
test "$1" && verbose=true
# TclX_Main.3tclx and TkX_Main.3tclx are in different packages, make a copy
-if cmp debian/tclx$V/usr/share/man/man3/{TclX_Main.3tclx,TkX_Main.3tclx}; then
+if cmp debian/tclx$V/usr/share/man/man3/TclX_Main.3tclx debian/tclx$V/usr/share/man/man3/TkX_Main.3tclx; then
rm -f debian/tclx$V/usr/share/man/man3/TkX_Main.3tclx
- cp -p debian/tclx$V/usr/share/man/man3/{TclX_Main.3tclx,TkX_Main.3tclx}
- ln -f debian/tclx$V/usr/share/man/man3/{TkX_Main.3tclx,Tkx_Init.3tclx}
+ cp -p debian/tclx$V/usr/share/man/man3/TclX_Main.3tclx debian/tclx$V/usr/share/man/man3/TkX_Main.3tclx
+ ln -f debian/tclx$V/usr/share/man/man3/TkX_Main.3tclx debian/tclx$V/usr/share/man/man3/Tkx_Init.3tclx
fi
inodes_with_hardlinks=$(
diff -u tclx8.3-8.3.5/debian/tkx8.3.menu tclx8.3-8.3.5/debian/tkx8.3.menu
--- tclx8.3-8.3.5/debian/tkx8.3.menu
+++ tclx8.3-8.3.5/debian/tkx8.3.menu
@@ -1,4 +1,4 @@
-?package(tkx8.3):needs="x11" section="Apps/Programming" \
+?package(tkx8.3):needs="x11" section="Applications/Programming" \
title="Tclhelp8.3" command="/usr/bin/tclhelp8.3"
-?package(tkx8.3):needs="x11" section="Apps/Programming" \
+?package(tkx8.3):needs="x11" section="Applications/Programming" \
title="Wishx8.3" command="x-terminal-emulator -e /usr/bin/wishx8.3"
only in patch2:
unchanged:
--- tclx8.3-8.3.5.orig/debian/compat
+++ tclx8.3-8.3.5/debian/compat
@@ -0,0 +1 @@
+5
signature.asc
Description: Digital signature
