diff -u yiff-2.12.4/debian/rules yiff-2.12.4/debian/rules --- yiff-2.12.4/debian/rules +++ yiff-2.12.4/debian/rules @@ -11,27 +11,23 @@ #export LD_LIBRARY_PATH=$(PWD)/libY2 VERSION=12 -# used by dh_makeshlibs for proper dependencies -DEBIAN_YIFF_COMPATABILITY_VERSION=2.12.4-3 -DEBIAN_NEXT_YIFF_VERSION=2.13.1 - build: build-stamp build-stamp: config-stamp dh_testdir - cd libY2;$(MAKE) -f Makefile.Linux;cd .. - cd yiffutils;$(MAKE) -f Makefile.Linux;cd .. - cd yiff;$(MAKE) -f Makefile.Linux;cd .. - cd yiffconfig;$(MAKE) -f Makefile.Linux;cd .. + cd libY2;$(MAKE) -f Makefile.Linux + cd yiffutils;$(MAKE) -f Makefile.Linux + cd yiff;$(MAKE) -f Makefile.Linux + cd yiffconfig;$(MAKE) -f Makefile.Linux touch build-stamp clean: unpatch dh_testdir dh_testroot rm -f build-stamp - cd libY2;$(MAKE) -f Makefile.Linux clean;rm -f libY2.so*;cd .. - cd yiff;$(MAKE) -f Makefile.Linux clean;cd .. - cd yiffconfig;$(MAKE) -f Makefile.Linux clean;cd .. - cd yiffutils;$(MAKE) -f Makefile.Linux clean;cd .. + cd libY2;$(MAKE) -f Makefile.Linux clean;rm -f libY2.so* + cd yiff;$(MAKE) -f Makefile.Linux clean + cd yiffconfig;$(MAKE) -f Makefile.Linux clean + cd yiffutils;$(MAKE) -f Makefile.Linux clean rm -f config-stamp rm -fr debian/patched dh_clean @@ -55,7 +51,7 @@ debian/yiff-server/usr/bin/$$i; \ done ) install -p -o root -g root -m 644 libY2/libY2.so.$(VERSION) \ - debian/liby2/usr/lib/libY2.so.$(VERSION) + debian/liby2-$(VERSION)/usr/lib/libY2.so.$(VERSION) ln -s libY2.so.$(VERSION) debian/liby-dev/usr/lib/libY2.so install -p -o root -g root -m 644 include/Y2/Y.h \ debian/liby-dev/usr/include/Y2/Y.h @@ -137,7 +133,7 @@ dh_strip dh_compress dh_fixperms - dh_makeshlibs --version-info='liby2 (>=${DEBIAN_YIFF_COMPATABILITY_VERSION}), liby2 (<<${DEBIAN_NEXT_YIFF_VERSION})' + dh_makeshlibs -V dh_installdeb # dh_perl dh_shlibdeps reverted: --- yiff-2.12.4/debian/liby2.dirs +++ yiff-2.12.4.orig/debian/liby2.dirs @@ -1 +0,0 @@ -usr/lib diff -u yiff-2.12.4/debian/changelog yiff-2.12.4/debian/changelog --- yiff-2.12.4/debian/changelog +++ yiff-2.12.4/debian/changelog @@ -1,3 +1,14 @@ +yiff (2.12.4-7.1) unstable; urgency=low + + * NMU + * fix shlibs, really + * conflict with liby2 >> 2.06-3, which existed in Debian. + * remove the <= kind of shlibs file construct + * remove the unnecessary final cd .. in the debian/rules. + * debian/rules: install directory is debian/liby2-$(VERSION)/ + + -- Junichi Uekawa Mon, 1 Apr 2002 14:26:21 +0900 + yiff (2.12.4-7) unstable; urgency=low * Amended shlibs to fix upgrade problems (closes: #138815) diff -u yiff-2.12.4/debian/control yiff-2.12.4/debian/control --- yiff-2.12.4/debian/control +++ yiff-2.12.4/debian/control @@ -21,12 +21,12 @@ More information can be found at the YIFF web site http://wolfpack.twu.net/YIFF/ . -Package: liby2 +Package: liby2-12 Architecture: any Depends: ${shlibs:Depends} Suggests: yiff-server (>= ${Source-Version}) Section: libs -Conflicts: libyiff2 +Conflicts: libyiff2, liby2 (>> 2.06-3) Replaces: libyiff2 Description: Y Sound Server Library YIFF is a network based and multi client connection system that @@ -40,7 +40,7 @@ Package: liby-dev Architecture: any Section: devel -Depends: liby2 (= ${Source-Version}) +Depends: liby2-12 (= ${Source-Version}) Conflicts: libyiff2-dev, liby2-dev Replaces: libyiff2-dev, liby2-dev, liby2 (<= 2.12.4-2) Description: Y Sound Server Library Header Files only in patch2: --- yiff-2.12.4.orig/debian/liby2-12.dirs +++ yiff-2.12.4/debian/liby2-12.dirs @@ -0,0 +1 @@ +usr/lib