diff -u gnu-smalltalk-3.2.4/debian/dh_fixstars gnu-smalltalk-3.2.4/debian/dh_fixstars --- gnu-smalltalk-3.2.4/debian/dh_fixstars +++ gnu-smalltalk-3.2.4/debian/dh_fixstars @@ -54,10 +54,32 @@ ); } +sub path_to_shlib { + my $lib = shift; + my $multiarch_dir = debarch_to_multiarch(get_raw_host_arch()); + my %dirs = ( + "/lib/$lib" => "/lib/$lib", + "/usr/lib/$lib" => "../$lib", + "/usr/lib/$multiarch_dir/$lib" => "../$multiarch_dir/$lib", + "/lib/$multiarch_dir/$lib" => "/lib/$multiarch_dir/$lib" + ); + + # Found path; can be empty. + my $path; + + while (my ($k, $v) = each(%dirs)) { + if (-e "$k") { + $path = "$v"; + last; + } + } + + return $path; +} + sub add_symlinks { my $tmp = shift; my $star_file = shift; - my $multiarch_dir = debarch_to_multiarch(get_raw_host_arch()); open(PACKAGEXML, "unzip -p $star_file package.xml |"); @@ -70,15 +92,11 @@ my $lib = $shlibdata{$1}; if ($lib) { - if (-e "/usr/lib/$lib") { - doit("rm", "-f", "$sym"); - doit("mkdir", "-p", "$pwd/$tmp/usr/lib/gnu-smalltalk"); - doit("ln", "-s", "../$lib", "$sym"); - doit("chown", "--no-dereference", "0:0", "$sym"); - } elsif (-e "/usr/lib/$multiarch_dir/$lib") { + my $target = path_to_shlib($lib); + if ($target) { doit("rm", "-f", "$sym"); doit("mkdir", "-p", "$pwd/$tmp/usr/lib/gnu-smalltalk"); - doit("ln", "-s", "../$lib", "$sym"); + doit("ln", "-s", "$target", "$sym"); doit("chown", "--no-dereference", "0:0", "$sym"); } else { error("Can't find \"$lib\" (\"$1\" in \"$star_file\")!"); diff -u gnu-smalltalk-3.2.4/debian/gnu-smalltalk-common.install gnu-smalltalk-3.2.4/debian/gnu-smalltalk-common.install --- gnu-smalltalk-3.2.4/debian/gnu-smalltalk-common.install +++ gnu-smalltalk-3.2.4/debian/gnu-smalltalk-common.install @@ -27,7 +27,13 @@ usr/share/gnu-smalltalk/Sockets.star usr/share/gnu-smalltalk/VFSAddOns.star usr/share/gnu-smalltalk/WebServer.star -usr/share/gnu-smalltalk/XML*.star +usr/share/gnu-smalltalk/XML-DOM.star +usr/share/gnu-smalltalk/XML-ParserTests.star +usr/share/gnu-smalltalk/XML-PullParser.star +usr/share/gnu-smalltalk/XML-SAXDriver.star +usr/share/gnu-smalltalk/XML-SAXParser.star +usr/share/gnu-smalltalk/XML-XMLNodeBuilder.star +usr/share/gnu-smalltalk/XML-XMLParser.star usr/share/gnu-smalltalk/XPath.star usr/share/gnu-smalltalk/XSL.star usr/share/gnu-smalltalk/packages.xml diff -u gnu-smalltalk-3.2.4/debian/rules gnu-smalltalk-3.2.4/debian/rules --- gnu-smalltalk-3.2.4/debian/rules +++ gnu-smalltalk-3.2.4/debian/rules @@ -47,12 +47,12 @@ --disable-relocatable \ CFLAGS="$(myCFLAGS)" # Get some info about the cpu and memory - cat /proc/cpuinfo /proc/meminfo + -cat /proc/cpuinfo /proc/meminfo touch $@ -build: configure-stamp build-stamp +build: build-stamp -build-stamp: +build-stamp: configure-stamp dh_testdir $(MAKE) -$(MAKE) -k check @@ -89,9 +89,6 @@ # copy the icon cp debian/gsticon.xpm debian/gnu-smalltalk-browser/usr/share/pixmaps/gsticon.xpm - # remove Expat bindings for now - rm -f debian/tmp/usr/share/gnu-smalltalk/XML-Expat.star - # remove rpath chrpath -d debian/tmp/usr/bin/gst debian/tmp/usr/bin/gst-browser \ debian/tmp/usr/bin/gst-convert debian/tmp/usr/bin/gst-doc \ @@ -110,8 +107,11 @@ # make the image file executable chmod +x debian/gnu-smalltalk/usr/lib/gnu-smalltalk/gst.im +# To silent out lintian +build-arch build-indep: build-stamp + # Build architecture-independent files here. -binary-indep: build install +binary-indep: build-indep install dh_testdir -i dh_testroot -i dh_installdocs -i @@ -133,7 +133,7 @@ dh_builddeb -i # Build architecture-dependent files here. -binary-arch: build install +binary-arch: build-arch install dh_testdir -a dh_testroot -a dh_installdocs -a @@ -158 +158 @@ -.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch +.PHONY: build-arch build-indep build clean binary-indep binary-arch binary install configure patch unpatch diff -u gnu-smalltalk-3.2.4/debian/control gnu-smalltalk-3.2.4/debian/control --- gnu-smalltalk-3.2.4/debian/control +++ gnu-smalltalk-3.2.4/debian/control @@ -3,11 +3,11 @@ Priority: extra Maintainer: Debian GNU Smalltalk maintainers Uploaders: Thomas Girard , Alexander Lazarević -Build-Depends: debhelper (>= 7), autotools-dev, libreadline-dev, libgmp-dev, quilt (>= 0.40), dpkg-dev (>= 1.13.19), libgdbm-dev, libgtk2.0-dev, libpq-dev, libsigsegv-dev (>= 2.9-2), libffi-dev (>= 3.0.5-2), zip, libsqlite3-dev, unzip, pkg-config, libltdl-dev, chrpath, gawk, libgnutls-dev, automake, autoconf, libtool, texinfo -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 7), autotools-dev, libreadline-dev, libncurses-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-sound1.2-dev, libsdl-ttf2.0-dev, libexpat1-dev, freeglut3-dev, libgmp-dev, quilt (>= 0.40), dpkg-dev (>= 1.13.19), libgdbm-dev, libgtk2.0-dev, libpq-dev, libsigsegv-dev (>= 2.9-2), libffi-dev (>= 3.0.5-2), zip, libsqlite3-dev, unzip, pkg-config, libltdl-dev, chrpath, gawk, libgnutls-dev, automake, autoconf, libtool, texinfo +Standards-Version: 3.9.2 Homepage: http://smalltalk.gnu.org -Vcs-Git: http://git.debian.org/git/collab-maint/pkg-gnu-smalltalk.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/pkg-gnu-smalltalk.git;a=summary +Vcs-Git: git://anonscm.debian.org/collab-maint/pkg-gnu-smalltalk.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/pkg-gnu-smalltalk.git;a=summary Package: gnu-smalltalk Architecture: any @@ -147,0 +148,56 @@ + +Package: libexpat-gst +Architecture: any +Depends: gnu-smalltalk (= ${binary:Version}), ${shlibs:Depends}, ${gst:Depends}, ${misc:Depends} +Description: Expat bindings for GNU Smalltalk + This package contains the Expat bindings for GNU Smalltalk. + . + For more information on GNU Smalltalk see the gnu-smalltalk package. + +Package: libsdl-gst +Architecture: any +Depends: gnu-smalltalk (= ${binary:Version}), ${shlibs:Depends}, ${gst:Depends}, ${misc:Depends} +Description: SDL bindings for GNU Smalltalk + This package contains the SDL bindings for GNU Smalltalk. + . + For more information on GNU Smalltalk see the gnu-smalltalk package. + +Package: libsdl-image-gst +Architecture: all +Depends: gnu-smalltalk (>= 3.2.4), ${gst:Depends}, ${misc:Depends} +Description: SDL_image bindings for GNU Smalltalk + This package contains the SDL_image bindings for GNU Smalltalk. + . + For more information on GNU Smalltalk see the gnu-smalltalk package. + +Package: libsdl-mixer-gst +Architecture: all +Depends: gnu-smalltalk (>= 3.2.4), ${gst:Depends}, ${misc:Depends} +Description: SDL_mixer bindings for GNU Smalltalk + This package contains the SDL_mixer bindings for GNU Smalltalk. + . + For more information on GNU Smalltalk see the gnu-smalltalk package. + +Package: libsdl-sound-gst +Architecture: all +Depends: gnu-smalltalk (>= 3.2.4), ${gst:Depends}, ${misc:Depends} +Description: SDL_sound bindings for GNU Smalltalk + This package contains the SDL_sound bindings for GNU Smalltalk. + . + For more information on GNU Smalltalk see the gnu-smalltalk package. + +Package: libsdl-ttf-gst +Architecture: all +Depends: gnu-smalltalk (>= 3.2.4), ${gst:Depends}, ${misc:Depends} +Description: SDL_ttf bindings for GNU Smalltalk + This package contains the SDL_ttf bindings for GNU Smalltalk. + . + For more information on GNU Smalltalk see the gnu-smalltalk package. + +Package: libgl-gst +Architecture: any +Depends: gnu-smalltalk (= ${binary:Version}), ${shlibs:Depends}, ${gst:Depends}, ${misc:Depends} +Description: OpenGL bindings for GNU Smalltalk + This package contains the OpenGL bindings for GNU Smalltalk. + . + For more information on GNU Smalltalk see the gnu-smalltalk package. diff -u gnu-smalltalk-3.2.4/debian/changelog gnu-smalltalk-3.2.4/debian/changelog --- gnu-smalltalk-3.2.4/debian/changelog +++ gnu-smalltalk-3.2.4/debian/changelog @@ -1,15 +1,23 @@ -gnu-smalltalk (3.2.4-1ubuntu2) oneiric; urgency=low +gnu-smalltalk (3.2.4-2) unstable; urgency=low - * No-change rebuild to make libgst7 installable which picked up a wrong - dependency due to a typo in libsigsegv2's symobls file. + * debian/dh_fixstars: search for shared libraries in /lib and in multiarch + directories. Thanks to Marcin Juszkiewicz + for the bug report and the initial patch. + * Add build-depency on libncurses-dev. Closes: #646140. + * New packages: + o libexpat-gst: bindings to Expat XML parser + o libsdl-gst: bindings to SDL + o libsdl-image-gst: bindings to SDL_image + o libsdl-mixer-gst: bindings to SDL_mixer + o libsdl-sound-gst: bindings to SDL_sound + o libsdl-ttf-gst: bindings to SDL_ttf + o libgl-gst: bindings to OpenGL + * debian/rules: Don't fail if /proc/cpuinfo does not exist. + * debian/control: change to new Alioth URLs. + * debian/patches/05_emacsen.diff: use (debian-pkg-add-load-path-item). + Closes: #593651. - -- Felix Geyer Tue, 09 Aug 2011 21:59:38 +0200 - -gnu-smalltalk (3.2.4-1ubuntu1) oneiric; urgency=low - - * debian/dh_fixstars: check also for multiarch directories (LP: #791326) - - -- Marcin Juszkiewicz Wed, 15 Jun 2011 13:30:31 +0200 + -- Thomas Girard Sun, 18 Dec 2011 23:30:34 +0100 gnu-smalltalk (3.2.4-1) unstable; urgency=low diff -u gnu-smalltalk-3.2.4/debian/patches/05_emacsen.diff gnu-smalltalk-3.2.4/debian/patches/05_emacsen.diff --- gnu-smalltalk-3.2.4/debian/patches/05_emacsen.diff +++ gnu-smalltalk-3.2.4/debian/patches/05_emacsen.diff @@ -2,7 +2,7 @@ index 4c7c041..56a9aa1 100644 --- a/smalltalk-mode-init.el.in +++ b/smalltalk-mode-init.el.in -@@ -15,6 +15,14 @@ +@@ -15,6 +15,11 @@ (push "\\.star\\'" inhibit-first-line-modes-regexps) @@ -14,8 +14,5 @@ -+(setq load-path -+ (append -+ (list ++(debian-pkg-add-load-path-item + (concat "/usr/share/" + (symbol-name debian-emacs-flavor) + "/site-lisp/gnu-smalltalk-el") + ) -+ load-path)) diff -u gnu-smalltalk-3.2.4/debian/patches/series gnu-smalltalk-3.2.4/debian/patches/series --- gnu-smalltalk-3.2.4/debian/patches/series +++ gnu-smalltalk-3.2.4/debian/patches/series @@ -4,0 +5 @@ +06_sdl_debian.diff only in patch2: unchanged: --- gnu-smalltalk-3.2.4.orig/debian/libsdl-gst.install +++ gnu-smalltalk-3.2.4/debian/libsdl-gst.install @@ -0,0 +1,4 @@ +usr/share/gnu-smalltalk/LibSDL.star +usr/share/gnu-smalltalk/LibSDL_GL.star +usr/share/gnu-smalltalk/CairoSDL.star +usr/lib/gnu-smalltalk/sdl*.so only in patch2: unchanged: --- gnu-smalltalk-3.2.4.orig/debian/libexpat-gst.install +++ gnu-smalltalk-3.2.4/debian/libexpat-gst.install @@ -0,0 +1,2 @@ +usr/share/gnu-smalltalk/XML-Expat.star +usr/lib/gnu-smalltalk/expat*.so only in patch2: unchanged: --- gnu-smalltalk-3.2.4.orig/debian/libgl-gst.install +++ gnu-smalltalk-3.2.4/debian/libgl-gst.install @@ -0,0 +1,4 @@ +usr/share/gnu-smalltalk/OpenGL.star +usr/share/gnu-smalltalk/GLUT.star +usr/lib/gnu-smalltalk/gstopengl*.so +usr/lib/gnu-smalltalk/gstglut*.so only in patch2: unchanged: --- gnu-smalltalk-3.2.4.orig/debian/libsdl-mixer-gst.install +++ gnu-smalltalk-3.2.4/debian/libsdl-mixer-gst.install @@ -0,0 +1 @@ +usr/share/gnu-smalltalk/LibSDL_mixer.star only in patch2: unchanged: --- gnu-smalltalk-3.2.4.orig/debian/libsdl-image-gst.install +++ gnu-smalltalk-3.2.4/debian/libsdl-image-gst.install @@ -0,0 +1 @@ +usr/share/gnu-smalltalk/LibSDL_image.star only in patch2: unchanged: --- gnu-smalltalk-3.2.4.orig/debian/libsdl-sound-gst.install +++ gnu-smalltalk-3.2.4/debian/libsdl-sound-gst.install @@ -0,0 +1 @@ +usr/share/gnu-smalltalk/LibSDL_sound.star only in patch2: unchanged: --- gnu-smalltalk-3.2.4.orig/debian/libsdl-ttf-gst.install +++ gnu-smalltalk-3.2.4/debian/libsdl-ttf-gst.install @@ -0,0 +1 @@ +usr/share/gnu-smalltalk/LibSDL_ttf.star only in patch2: unchanged: --- gnu-smalltalk-3.2.4.orig/debian/patches/06_sdl_debian.diff +++ gnu-smalltalk-3.2.4/debian/patches/06_sdl_debian.diff @@ -0,0 +1,56 @@ +diff --git a/packages/sdl/libsdl/package.xml b/packages/sdl/libsdl/package.xml +index caa648c..cf33a72 100644 +--- a/packages/sdl/libsdl/package.xml ++++ b/packages/sdl/libsdl/package.xml +@@ -25,6 +25,6 @@ + Display.st + EventSource.st + +- libSDL ++ libSDL-1.2 + sdl + +diff --git a/packages/sdl/libsdl_image/package.xml b/packages/sdl/libsdl_image/package.xml +index efb174d..8fb8c3a 100644 +--- a/packages/sdl/libsdl_image/package.xml ++++ b/packages/sdl/libsdl_image/package.xml +@@ -4,5 +4,5 @@ + + SDL_image.st + +- libSDL_image ++ libSDL_image-1.2 + +diff --git a/packages/sdl/libsdl_mixer/package.xml b/packages/sdl/libsdl_mixer/package.xml +index 49144f0..263b71e 100644 +--- a/packages/sdl/libsdl_mixer/package.xml ++++ b/packages/sdl/libsdl_mixer/package.xml +@@ -4,5 +4,5 @@ + + SDL_mixer.st + +- libSDL_mixer ++ libSDL_mixer-1.2 + +diff --git a/packages/sdl/libsdl_ttf/package.xml b/packages/sdl/libsdl_ttf/package.xml +index 532106c..a170107 100644 +--- a/packages/sdl/libsdl_ttf/package.xml ++++ b/packages/sdl/libsdl_ttf/package.xml +@@ -4,5 +4,5 @@ + + SDL_ttf.st + +- libSDL_ttf ++ libSDL_ttf-2.0 + +diff --git a/packages/sdl/libsdl_sound/package.xml b/packages/sdl/libsdl_sound/package.xml +index fe68a13..eaa081b 100644 +--- a/packages/sdl/libsdl_sound/package.xml ++++ b/packages/sdl/libsdl_sound/package.xml +@@ -6,5 +6,5 @@ + SDL_cdrom.st + SDL_sound.st + +- libSDL_sound ++ libSDL_sound-1.0 +