Bug#296531: zircon: Fails to start

2005-02-23 Thread Christian Aichinger 
tags 296531 patch
thanks

The problem is that zircons build system automatically adds a
shebang-line to the zircon executeable, which is customized for the
system zircon was built on (/usr/bin/wish8.0 in this case).

Since all Debian has a canonical /usr/bin/wish, this isn't necessary.
I've added a patch that short-circuits this logic and always uses
/usr/bin/wish.

Cheers,
Greek0
diff -Nur zircon-1.18.255/installer/unix.tcl 
zircon-1.18.255.new/installer/unix.tcl
--- zircon-1.18.255/installer/unix.tcl  2001-06-13 09:20:29.0 +0200
+++ zircon-1.18.255.new/installer/unix.tcl  2005-02-23 12:11:38.0 
+0100
@@ -154,7 +154,7 @@
 #
 proc getWish {} {
 global Wish
-switch {} $Wish {set Wish [findWish]}
+set Wish "/usr/bin/wish"
 }
 #
 proc getBin {} {
@@ -217,18 +217,6 @@
 return {}
 }
 #
-proc findWish {} {
-global env
-foreach x [split $env(PATH) :] {
-   foreach y {wish8.3 wish8.2 wish8.1 wish8.0 wish4.2 wish4.1 wish wishx} {
-   if {[file exists [set f [file join $x $y]]]} {
-   return $f
-   }
-   }
-}
-return {}
-}
-#
 proc prog7 {file to} {
 switch -glob -- [info tclversion] 8.* return
 zinfo "Compiling $file..."


pgpRXBOR5ITGB.pgp
Description: PGP signature

Bug#376358: Further work

2006-09-29 Thread Christian Aichinger 
On Sun, Jul 02, 2006 at 02:14:43PM -0300, Damián Viano wrote:
> Ok, here I include attached the following incremental patches:
>  - bashism.patch: previous patch that removes bashisms from debian/rules
>  - binary-indep.patch: adds required target to debian/rules
>  - ldconfig.patch: adds post{rm,inst} ldconfig calls

fsck. Duplicated work. :-/

I prepared a QA upload for socketapi, including all the stuff in
your patch...

Also included is a fix for missing dependencies, fixup of the shlibs
file, etc. I've attached the full diff.

Cheers,
Christian Aichinger
diff -u socketapi-1.7.0/debian/changelog socketapi-1.7.0/debian/changelog
--- socketapi-1.7.0/debian/changelog
+++ socketapi-1.7.0/debian/changelog
@@ -1,3 +1,17 @@
+socketapi (1.7.0-6) unstable; urgency=low
+
+  * QA upload.
+  * Fix build failure with /bin/sh = dash. Thanks to Damián Viano for the
+patch. Closes: #376358.
+  * Add binary-indep target to debian/rules (required by policy).
+  * Bump Standards-Version to 3.7.2, no changes necessary.
+  * Add postinst/postrm with call to ldconfig (fixes lintian error).
+  * Add ${shlibs:Depends} to debian/control so proper dependencies are
+generated.
+  * Fix broken shlibs file
+
+ -- Christian Aichinger <[EMAIL PROTECTED]>  Fri, 29 Sep 2006 18:36:47 +0200
+
 socketapi (1.7.0-5) unstable; urgency=low
 
   * QA upload.
diff -u socketapi-1.7.0/debian/control socketapi-1.7.0/debian/control
--- socketapi-1.7.0/debian/control
+++ socketapi-1.7.0/debian/control
@@ -2,14 +2,14 @@
 Section: libs
 Priority: optional
 Maintainer: Debian QA Group <[EMAIL PROTECTED]>
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 Build-Depends: libglib1.2-dev, sctplib-dev (>= 1:1.0.4-2), bzip2, chrpath, 
file, libtool, automake1.9, autoconf, autotools-dev
 
 Package: socketapi1
 Section: libs
 Priority: optional
 Architecture: any
-Depends: sctplib1 (>= 1:1.0.4-2), bzip2
+Depends: bzip2, ${shlibs:Depends}
 Description: socket API library for sctplib
  Socketapi provides a socket API for the SCTP userland implementation sctplib,
  conforming to draft-ietf-tsvwg-sctpsocket-06.txt.
diff -u socketapi-1.7.0/debian/rules socketapi-1.7.0/debian/rules
--- socketapi-1.7.0/debian/rules
+++ socketapi-1.7.0/debian/rules
@@ -46,6 +46,8 @@
cd debian/tmp && install -d usr/bin
 
cd debian && install -m 644 shlibs $(plib)/DEBIAN
+   cd debian && install -m 755 postinst $(plib)/DEBIAN
+   cd debian && install -m 755 postrm $(plib)/DEBIAN
 
cd shared/usr/lib && chrpath --delete libcppsctpsocket-170.so.1.0.7
cd shared/usr/lib && $(STRIP) --strip-unneeded 
libsctpsocket-170.so.1.0.7
@@ -60,15 +62,15 @@
 
cp -p debian/copyright $(docdir)
cp -p debian/changelog $(docdir)/changelog.Debian
-   tar cf $(docdir)/examples/cppsocket_programs.tar --exclude .libs 
--exclude .deps cppsocket_programs/README cppsocket_programs/*.cc 
cppsocket_programs/*.h
+   tar cf $(docdir)/examples/cppsocket_programs.tar --exclude .libs 
--exclude .deps \
+   cppsocket_programs/README cppsocket_programs/*.cc 
cppsocket_programs/*.h
tar cf $(docdir)/examples/socket_programs.tar --exclude .libs --exclude 
.deps socket_programs/*.c
cd $(docdir) && bzip2 -9 examples/*
cd $(docdir) && gzip -9 changelog.Debian
 
ln -s $(plib) debian/$(plibdev)/usr/share/doc/$(plibdev)
 
-#  dpkg-shlibdeps debian/$(plib)/usr/lib/*
-   dpkg-shlibdeps -O debian/$(plib)/usr/lib/* | sed 's/libsctp (>= 1.0), 
//' > debian/substvars
+   dpkg-shlibdeps debian/$(plib)/usr/lib/*
dpkg-gencontrol -isp -p$(plib) -Pdebian/$(plib)
cd debian/$(plib) && md5sum `find * -type f ! -regex "DEBIAN/.*"` > 
DEBIAN/md5sums
chown -R root.root debian/$(plib)
@@ -87,6 +89,9 @@
test -f debian/rules
 endef
 
+binary-indep: checkroot build
+# We have nothing to do.
+
 binary: binary-indep binary-arch
 
 checkroot:
diff -u socketapi-1.7.0/debian/shlibs socketapi-1.7.0/debian/shlibs
--- socketapi-1.7.0/debian/shlibs
+++ socketapi-1.7.0/debian/shlibs
@@ -1,2 +1,4 @@
-libsctpsocket-170  1   socketapi (>= 1.7.0-1)
-libcppsctpsocket-170   1   socketapi (>= 1.7.0-1)
+libsctpsocket-170  1   socketapi1 (>= 1.7.0-1)
+libcppsctpsocket-170   1   socketapi1 (>= 1.7.0-1)
+libsctpsocket  1   socketapi1 (>= 1.7.0-1)
+libcppsctpsocket   1   socketapi1 (>= 1.7.0-1)
only in patch2:
unchanged:
--- socketapi-1.7.0.orig/debian/postinst
+++ socketapi-1.7.0/debian/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+   ldconfig
+fi
only in patch2:
unchanged:
--- socketapi-1.7.0.orig/debian/postrm
+++ socketapi-1.7.0/debian/postrm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]; then
+   ldconfig
+fi


signature.asc
Description: Digital signature