Bug#863346: jessie-pu: package libsx/2.05-6+deb8u1

[Cyril Brulebois]

Control: tag -1 moreinfo

Hi,

Adrian Bunk  (2017-05-25):
> Package: release.debian.org
> Severity: normal
> Tags: jessie
> User: release.debian@packages.debian.org
> Usertags: pu

Feel free to articulate some sentences when requesting an update.

Also, attaching a patch means it can be applied instead of being
mangled (the debian/rules part doesn't apply).

> diff -Nru libsx-2.05/debian/changelog libsx-2.05/debian/changelog
> --- libsx-2.05/debian/changelog   2014-09-13 16:46:07.0 +0300
> +++ libsx-2.05/debian/changelog   2017-05-25 19:30:28.0 +0300
> @@ -1,3 +1,12 @@
> +libsx (2.05-6+deb8u1) jessie; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * Apply changes from Alastair McKinstry to ship libsx.h, libsx.pc,
> +libsx.a and the HTML documentation in libsx-dev and the dialogs
> +to libsx0. (Closes: #856725)
> +
> + -- Adrian Bunk   Thu, 25 May 2017 19:19:58 +0300
> +
>  libsx (2.05-6) unstable; urgency=medium
>  
>* Apply patch from Alexander to fix clang compilation. Closes: #758760. 
> diff -Nru libsx-2.05/debian/libsx-dev.install 
> libsx-2.05/debian/libsx-dev.install
> --- libsx-2.05/debian/libsx-dev.install   2014-09-13 16:46:07.0 
> +0300
> +++ libsx-2.05/debian/libsx-dev.install   1970-01-01 02:00:00.0 
> +0200
> @@ -1,5 +0,0 @@
> -src/libsx.h  usr/include
> -src/libsx.a  usr/lib/*
> -docs/html/*  usr/share/doc/libsx-dev/html
> -docs/text/*  usr/share/doc/libsx-dev/text
> -debian/libsx.pc  usr/lib/*/pkgconfig

With your patch, this file gets autogenerated, so appears in the final
source package after a binary build.

> diff -Nru libsx-2.05/debian/rules libsx-2.05/debian/rules
> --- libsx-2.05/debian/rules   2014-09-13 16:46:07.0 +0300
> +++ libsx-2.05/debian/rules   2017-05-25 19:32:11.0 +0300
> @@ -6,6 +6,7 @@
>  
>  DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
>  LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
> +AUTOGENERATED:= libsx-dev.install
>  
>  CFLAGS = `dpkg-buildflags --get CFLAGS`
>  CFLAGS += `dpkg-buildflags --get CPPFLAGS`
> @@ -15,9 +16,13 @@
>   dh_installexamples -Xlibsx.h
>  
>  override_dh_install:
> - dh_auto_install
> + for f in ${AUTOGENERATED} ; do \
> +sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > 
> debian/$$f ; \
> +done
>   mkdir -p debian/libsx0/$(LIBDIR)
>   mv src/libsx.so debian/libsx0/$(LIBDIR)/libsx.so.0.0.0
>   dh_link -p libsx0 $(LIBDIR)/libsx.so.0.0.0  $(LIBDIR)/libsx.so.0
>   dh_link -p libsx-dev $(LIBDIR)/libsx.so.0.0.0 $(LIBDIR)/libsx.so
> + dh_install 
> + dh_auto_install

I don't understand what one expects dh_auto_install to do *after*
dh_install.


KiBi.


signature.asc
Description: Digital signature

Bug#863346: jessie-pu: package libsx/2.05-6+deb8u1

[Adrian Bunk]

Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian@packages.debian.org
Usertags: pu


 changelog|9 +
 libsx-dev.install|5 -
 libsx-dev.install.in |5 +
 libsx.pc |   10 ++
 libsx.pc.in  |   10 --
 rules|7 ++-
 6 files changed, 30 insertions(+), 16 deletions(-)

diff -Nru libsx-2.05/debian/changelog libsx-2.05/debian/changelog
--- libsx-2.05/debian/changelog 2014-09-13 16:46:07.0 +0300
+++ libsx-2.05/debian/changelog 2017-05-25 19:30:28.0 +0300
@@ -1,3 +1,12 @@
+libsx (2.05-6+deb8u1) jessie; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply changes from Alastair McKinstry to ship libsx.h, libsx.pc,
+libsx.a and the HTML documentation in libsx-dev and the dialogs
+to libsx0. (Closes: #856725)
+
+ -- Adrian Bunk   Thu, 25 May 2017 19:19:58 +0300
+
 libsx (2.05-6) unstable; urgency=medium
 
   * Apply patch from Alexander to fix clang compilation. Closes: #758760. 
diff -Nru libsx-2.05/debian/libsx-dev.install 
libsx-2.05/debian/libsx-dev.install
--- libsx-2.05/debian/libsx-dev.install 2014-09-13 16:46:07.0 +0300
+++ libsx-2.05/debian/libsx-dev.install 1970-01-01 02:00:00.0 +0200
@@ -1,5 +0,0 @@
-src/libsx.husr/include
-src/libsx.ausr/lib/*
-docs/html/*usr/share/doc/libsx-dev/html
-docs/text/*usr/share/doc/libsx-dev/text
-debian/libsx.pcusr/lib/*/pkgconfig
diff -Nru libsx-2.05/debian/libsx-dev.install.in 
libsx-2.05/debian/libsx-dev.install.in
--- libsx-2.05/debian/libsx-dev.install.in  1970-01-01 02:00:00.0 
+0200
+++ libsx-2.05/debian/libsx-dev.install.in  2017-05-25 19:21:25.0 
+0300
@@ -0,0 +1,5 @@
+src/libsx.husr/include
+src/libsx.ausr/lib/@ARCH@
+docs/html/*usr/share/doc/libsx-dev/html
+docs/text/*usr/share/doc/libsx-dev/text
+debian/libsx.pcusr/lib/@ARCH@/pkgconfig
diff -Nru libsx-2.05/debian/libsx.pc libsx-2.05/debian/libsx.pc
--- libsx-2.05/debian/libsx.pc  1970-01-01 02:00:00.0 +0200
+++ libsx-2.05/debian/libsx.pc  2017-05-25 19:21:25.0 +0300
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+
+Name: libsx 
+Description: Simple X library
+Version: 2.05
+Libs:  -L${libdir} -lsx
+Requires.private: xt xmu xpm xaw7
+Libs.private: -$L{libdir} -lsx -lX11 -lXpm -Xaw -Xmu
diff -Nru libsx-2.05/debian/libsx.pc.in libsx-2.05/debian/libsx.pc.in
--- libsx-2.05/debian/libsx.pc.in   2014-09-13 16:46:07.0 +0300
+++ libsx-2.05/debian/libsx.pc.in   1970-01-01 02:00:00.0 +0200
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-
-Name: libsx 
-Description: Simple X library
-Version: 2.05
-Libs:  -L${libdir} -lsx
-Requires.private: xt xmu xpm xaw7
-Libs.private: -$L{libdir} -lsx -lX11 -lXpm -Xaw -Xmu
diff -Nru libsx-2.05/debian/rules libsx-2.05/debian/rules
--- libsx-2.05/debian/rules 2014-09-13 16:46:07.0 +0300
+++ libsx-2.05/debian/rules 2017-05-25 19:32:11.0 +0300
@@ -6,6 +6,7 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+AUTOGENERATED:= libsx-dev.install
 
 CFLAGS = `dpkg-buildflags --get CFLAGS`
 CFLAGS += `dpkg-buildflags --get CPPFLAGS`
@@ -15,9 +16,13 @@
dh_installexamples -Xlibsx.h
 
 override_dh_install:
-   dh_auto_install
+   for f in ${AUTOGENERATED} ; do \
+sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > 
debian/$$f ; \
+done
mkdir -p debian/libsx0/$(LIBDIR)
mv src/libsx.so debian/libsx0/$(LIBDIR)/libsx.so.0.0.0
dh_link -p libsx0 $(LIBDIR)/libsx.so.0.0.0  $(LIBDIR)/libsx.so.0
dh_link -p libsx-dev $(LIBDIR)/libsx.so.0.0.0 $(LIBDIR)/libsx.so
+   dh_install 
+   dh_auto_install