Hi Martin,

any new concerning how we proceed? We need to stop the upload from the
delayed queue if you prefer a different approach, but without hearing
from you what to do I am a bit in the dark what to do.

Thanks

Norbert

On Mon, 22 Oct 2018, Norbert Preining wrote:
> Hi Martin,
> 
> great to hear from you!!! 
> 
> > Well, it seems my email has been a bit weird of late, as I've not seen the
> > ITS until now!
> 
> Umpf, nor the email from 1 year ago about library support it seems.
> 
> > All my packages have always been LowNMU - and help has always been
> > welcome.  You're more than welcome to take this package of you wish,
> > although my preference would have been for us to work together.
> 
> I am more than happy to work with you, I just wanted to get the shared
> library of rar back, since I need it for a python package that in turn
> is useful for calibre ;-)
> 
> I attach a patch that only shows the changes to the files under debian/,
> please use it for a proper upload if it helps (just remove the
> maintainer change part). 
> 
> We can also set up a common git repository on salsa under the colabmaint
> and I commit there.
> 
> I am more than happy NOT to take over this package, if there is no need
> for it.
> 
> All the best
> 
> Norbert
> 
> --
> PREINING Norbert                               http://www.preining.info
> Accelia Inc.     +    JAIST     +    TeX Live     +    Debian Developer
> GPG: 0x860CDC13   fp: F7D8 A928 26E3 16A1 9FA0 ACF0 6CAC A448 860C DC13

> diff -Nru unrar-nonfree-5.5.8/debian/changelog 
> unrar-nonfree-5.6.6/debian/changelog
> --- unrar-nonfree-5.5.8/debian/changelog      2017-08-21 21:29:11.000000000 
> +0900
> +++ unrar-nonfree-5.6.6/debian/changelog      2018-10-22 10:37:47.000000000 
> +0900
> @@ -1,3 +1,11 @@
> +unrar-nonfree (1:5.6.6-1) unstable; urgency=medium
> +
> +  * Package salvaged (Closes: #909795)
> +  * add libunrar5 and libunrar-dev packages
> +  * bump standards version, no changes necessary
> +
> + -- Norbert Preining <prein...@debian.org>  Mon, 22 Oct 2018 10:37:47 +0900
> +
>  unrar-nonfree (1:5.5.8-1) unstable; urgency=high
>  
>    * New upstream release
> diff -Nru unrar-nonfree-5.5.8/debian/control 
> unrar-nonfree-5.6.6/debian/control
> --- unrar-nonfree-5.5.8/debian/control        2017-08-21 21:29:11.000000000 
> +0900
> +++ unrar-nonfree-5.6.6/debian/control        2018-10-22 10:37:47.000000000 
> +0900
> @@ -1,11 +1,13 @@
>  Source: unrar-nonfree
>  Section: non-free/utils
>  Priority: optional
> -Maintainer: Martin Meredith <m...@debian.org>
> +Maintainer: Norbert Preining <prein...@debian.org>
>  Homepage: http://www.rarlabs.com/
>  Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~)
> -Standards-Version: 4.0.1
> +Standards-Version: 4.2.1
>  XS-Autobuild: yes
> +Vcs-Browser: https://salsa.debian.org/preining/unrar-nonfree
> +Vcs-Git: https://salsa.debian.org/preining/unrar-nonfree.git
>  
>  Package: unrar
>  Architecture: any
> @@ -14,3 +16,22 @@
>  Description: Unarchiver for .rar files (non-free version)
>   Unrar can extract files from .rar archives. If you want to create .rar
>   archives, install package rar.
> +
> +Package: libunrar5
> +Section: non-free/libs
> +Architecture: any
> +Multi-Arch: same
> +Depends: ${misc:Depends}, ${shlibs:Depends}
> +Pre-Depends: ${misc:Pre-Depends}
> +Description: Unarchiver for .rar files (non-free version) - shared library
> + library for unarchiving .rar files
> +
> +Package: libunrar-dev
> +Section: non-free/libdevel
> +Architecture: any
> +Multi-Arch: same
> +Depends: ${misc:Depends}, libunrar5 (= ${binary:Version}), ${shlibs:Depends}
> +Description: Unarchiver for .rar files (non-free version) - development files
> + This package contains the static library and header files for the
> + libunrar library.
> +
> diff -Nru unrar-nonfree-5.5.8/debian/patches/fix-buildflags 
> unrar-nonfree-5.6.6/debian/patches/fix-buildflags
> --- unrar-nonfree-5.5.8/debian/patches/fix-buildflags 2017-06-23 
> 02:07:52.000000000 +0900
> +++ unrar-nonfree-5.6.6/debian/patches/fix-buildflags 2018-10-22 
> 10:37:47.000000000 +0900
> @@ -1,16 +1,30 @@
> ---- a/makefile
> -+++ b/makefile
> -@@ -3,12 +3,10 @@
> +---
> + makefile |    6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
>  
> +--- unrar.orig/makefile
> ++++ unrar/makefile
> +@@ -3,12 +3,12 @@
> + 
>   # Linux using GCC
>   CXX=c++
> --CXXFLAGS=-O2
> --LIBFLAGS=-fPIC
> +-CXXFLAGS=-O2 -Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else
> ++CXXFLAGS=-Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else
> + LIBFLAGS=-fPIC
>   DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
>   STRIP=strip
>   AR=ar
>  -LDFLAGS=-pthread
>  +LDFLAGS+=-pthread
>   DESTDIR=/usr
> -
> + 
>   # Linux using LCC
> +@@ -156,7 +156,7 @@ lib:     CXXFLAGS+=$(LIBFLAGS)
> + lib:        clean $(OBJECTS) $(LIB_OBJ)
> +     @rm -f libunrar.so
> +     @rm -f libunrar.a
> +-    $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
> ++    $(LINK) -Wl,-soname,libunrar.so.5 -shared -o libunrar.so $(LDFLAGS) 
> $(OBJECTS) $(LIB_OBJ)
> +     $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ)
> + 
> + install-unrar:
> diff -Nru unrar-nonfree-5.5.8/debian/rules unrar-nonfree-5.6.6/debian/rules
> --- unrar-nonfree-5.5.8/debian/rules  2013-08-15 23:48:15.000000000 +0900
> +++ unrar-nonfree-5.6.6/debian/rules  2018-10-22 10:37:47.000000000 +0900
> @@ -1,5 +1,7 @@
>  #!/usr/bin/make -f
>  
> +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
> +
>  DPKG_EXPORT_BUILDFLAGS = 1
>  include /usr/share/dpkg/buildflags.mk
>  
> @@ -9,13 +11,18 @@
>  build-stamp:
>       dh_testdir
>       make -f makefile
> +     make -f makefile lib
> +     touch build-stamp
>  
>  clean:
>       dh_testdir
>       dh_testroot
>  
>       make -f makefile clean
> -     rm -rf unrar
> +     rm -f unrar
> +     rm -f libunrar.so
> +     rm -f libunrar.a
> +     rm -f build-stamp
>       dh_clean
>  
>  binary-indep:
> @@ -30,9 +37,19 @@
>  
>       install -o root -g root -s -m 0755 unrar 
> debian/unrar/usr/bin/unrar-nonfree
>  
> +     mkdir -p debian/libunrar5/usr/lib/$(DEB_HOST_MULTIARCH)
> +     mkdir -p debian/libunrar-dev/usr/lib/$(DEB_HOST_MULTIARCH)
> +     mkdir -p debian/libunrar-dev/usr/include/$(DEB_HOST_MULTIARCH)/unrar
> +
> +     install -o root -g root -s -m 0755 libunrar.so 
> debian/libunrar5/usr/lib/$(DEB_HOST_MULTIARCH)/libunrar.so.5
> +     install -o root -g root    -m 0644 libunrar.a  
> debian/libunrar-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libunrar.a
> +     install -o root -g root    -m 0644 *.hpp       
> debian/libunrar-dev/usr/include/$(DEB_HOST_MULTIARCH)/unrar
> +     ln -s libunrar.so.5 
> debian/libunrar-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libunrar.so
> +
>       dh_installdocs
>       dh_installman debian/unrar-nonfree.1
>       dh_installchangelogs
> +     dh_makeshlibs -plibunrar5
>       dh_strip
>       dh_compress
>       dh_fixperms

Norbert

--
PREINING Norbert                               http://www.preining.info
Accelia Inc.     +    JAIST     +    TeX Live     +    Debian Developer
GPG: 0x860CDC13   fp: F7D8 A928 26E3 16A1 9FA0 ACF0 6CAC A448 860C DC13

Reply via email to