[med-svn] [Git][med-team/libzstd][master] 3 commits: Remove indexes from patches

Tue Apr 3 11:43:52 UTC 2018

Alexandre Mestiashvili pushed to branch master at Debian Med / libzstd


Commits:
fcad1da1 by Alexandre Mestiashvili at 2018-04-03T13:14:11+02:00
Remove indexes from patches

- - - - -
6f4685aa by Alexandre Mestiashvili at 2018-04-03T13:33:40+02:00
Remove Multi-Arch field from -udeb section, update my email address

- - - - -
42d55068 by Alexandre Mestiashvili at 2018-04-03T13:38:20+02:00
Update changelog, prepare for release

Gbp-Dch: Ignore

- - - - -


7 changed files:

- debian/changelog
- debian/control
- debian/patches/0003-Add-symlinks-for-extra-manpages.patch
- debian/patches/0004-Add-help2man-d-pzstd-man-file.patch
- debian/patches/0006-Use-bash-for-test-script-portablitity.patch
- debian/patches/0008-Address-embedded-zlib.patch
- debian/patches/0009-Add-shebang-for-scripts.patch


Changes:

=====================================
debian/changelog
=====================================

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libzstd (1.3.4+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 1.3.4+dfsg
+  * Update d/control:
+    - bump Policy to 4.1.3
+    - update Package-Type and remove Multi-Arch field from -udeb section
+  * Refresh patches, remove indexes
+  * Disable tests if DEB_BUILD_OPTIONS set to nocheck
+  * Update libzstd1.symbols file
+
+ -- Alexandre Mestiashvili <mestia at debian.org>  Tue, 03 Apr 2018 13:24:49 +0200
+
 libzstd (1.3.3+dfsg-2) unstable; urgency=medium
 
   [ Dimitri John Ledkov ]


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libzstd
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Kevin Murray <kdmfoss at gmail.com>,
            Olivier Sallou <osallou at debian.org>,
-           Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
+           Alexandre Mestiashvili <mestia at debian.org>
 Section: libs
 Priority: optional
 Build-Depends: debhelper (>= 10),
@@ -39,7 +39,6 @@ Description: fast lossless compression algorithm
 
 Package: libzstd1-udeb
 Architecture: any
-Multi-Arch: same
 Section: debian-installer
 Depends: ${shlibs:Depends},
          ${misc:Depends}


=====================================
debian/patches/0003-Add-symlinks-for-extra-manpages.patch
=====================================
--- a/debian/patches/0003-Add-symlinks-for-extra-manpages.patch
+++ b/debian/patches/0003-Add-symlinks-for-extra-manpages.patch
@@ -9,11 +9,8 @@ Subject: Add symlinks for extra manpages
  create mode 100644 programs/unzstd.1
  create mode 100644 programs/zstdcat.1
 
-diff --git a/programs/unzstd.1 b/programs/unzstd.1
-new file mode 100644
-index 0000000..5ccdf8a
 --- /dev/null
-+++ b/programs/unzstd.1
++++ libzstd/programs/unzstd.1
 @@ -0,0 +1,92 @@
 +\"
 +\" zstd.1: This is a manual page for 'zstd' program. This file is part of the
@@ -107,11 +104,8 @@ index 0000000..5ccdf8a
 +
 +.SH AUTHOR
 +Yann Collet
-diff --git a/programs/zstdcat.1 b/programs/zstdcat.1
-new file mode 100644
-index 0000000..5ccdf8a
 --- /dev/null
-+++ b/programs/zstdcat.1
++++ libzstd/programs/zstdcat.1
 @@ -0,0 +1,92 @@
 +\"
 +\" zstd.1: This is a manual page for 'zstd' program. This file is part of the


=====================================
debian/patches/0004-Add-help2man-d-pzstd-man-file.patch
=====================================
--- a/debian/patches/0004-Add-help2man-d-pzstd-man-file.patch
+++ b/debian/patches/0004-Add-help2man-d-pzstd-man-file.patch
@@ -7,11 +7,8 @@ Subject: Add help2man'd pzstd man file
  1 file changed, 76 insertions(+)
  create mode 100644 contrib/pzstd/pzstd.1
 
-diff --git a/contrib/pzstd/pzstd.1 b/contrib/pzstd/pzstd.1
-new file mode 100644
-index 0000000..03c81cf
 --- /dev/null
-+++ b/contrib/pzstd/pzstd.1
++++ libzstd/contrib/pzstd/pzstd.1
 @@ -0,0 +1,76 @@
 +.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
 +.TH PZSTD "1" "October 2016" "PZSTD version: 1.1.0." "User Commands"


=====================================
debian/patches/0006-Use-bash-for-test-script-portablitity.patch
=====================================
--- a/debian/patches/0006-Use-bash-for-test-script-portablitity.patch
+++ b/debian/patches/0006-Use-bash-for-test-script-portablitity.patch
@@ -6,10 +6,8 @@ Subject: Use bash for test script portablitity
  tests/playTests.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/tests/playTests.sh b/tests/playTests.sh
-index ad70538..81b2e34 100755
---- a/tests/playTests.sh
-+++ b/tests/playTests.sh
+--- libzstd.orig/tests/playTests.sh
++++ libzstd/tests/playTests.sh
 @@ -1,4 +1,4 @@
 -#!/bin/sh -e
 +#!/bin/bash -e


=====================================
debian/patches/0008-Address-embedded-zlib.patch
=====================================
--- a/debian/patches/0008-Address-embedded-zlib.patch
+++ b/debian/patches/0008-Address-embedded-zlib.patch
@@ -1,8 +1,8 @@
 Description: Fix use of fprintf
 Author: Sascha Steinbiss <satta at debian.org>
---- a/zlibWrapper/Makefile
-+++ b/zlibWrapper/Makefile
-@@ -13,7 +13,7 @@ ZLIB_PATH ?= .
+--- libzstd.orig/zlibWrapper/Makefile
++++ libzstd/zlibWrapper/Makefile
+@@ -13,7 +13,7 @@
  ZSTDLIBDIR = ../lib
  ZSTDLIBRARY = $(ZSTDLIBDIR)/libzstd.a
  ZLIBWRAPPER_PATH = .
@@ -11,7 +11,7 @@ Author: Sascha Steinbiss <satta at debian.org>
  EXAMPLE_PATH = examples
  PROGRAMS_PATH = ../programs
  TEST_FILE = ../doc/zstd_compression_format.md
-@@ -70,16 +70,16 @@ valgrindTest: clean example fitblk examp
+@@ -70,16 +70,16 @@
  #.c.o:
  #	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
  
@@ -32,8 +32,8 @@ Author: Sascha Steinbiss <satta at debian.org>
  	$(CC) $(LDFLAGS) $^ $(ZLIB_LIBRARY) -o $@
  
  fitblk: $(EXAMPLE_PATH)/fitblk.o $(ZLIBWRAPPER_PATH)/zstd_zlibwrapper.o $(ZSTDLIBRARY)
---- a/zlibWrapper/examples/example.c
-+++ b/zlibWrapper/examples/example.c
+--- libzstd.orig/zlibWrapper/examples/example.c
++++ libzstd/zlibWrapper/examples/example.c
 @@ -27,7 +27,7 @@
  
  /* @(#) $Id$ */


=====================================
debian/patches/0009-Add-shebang-for-scripts.patch
=====================================
--- a/debian/patches/0009-Add-shebang-for-scripts.patch
+++ b/debian/patches/0009-Add-shebang-for-scripts.patch
@@ -1,7 +1,7 @@
 Description: add shebang line to new script
 Author: Sascha Steinbiss <satta at debian.org>
---- a/programs/zstdless
-+++ b/programs/zstdless
+--- libzstd.orig/programs/zstdless
++++ libzstd/programs/zstdless
 @@ -1,2 +1,4 @@
  #!/bin/sh
 +



View it on GitLab: https://salsa.debian.org/med-team/libzstd/compare/59caddb3f611ab00c418e1a015641ca2c4eb1786...42d5506872b6bf701432eeae97ea38d7239d33fa

---
View it on GitLab: https://salsa.debian.org/med-team/libzstd/compare/59caddb3f611ab00c418e1a015641ca2c4eb1786...42d5506872b6bf701432eeae97ea38d7239d33fa
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180403/07279b3f/attachment-0001.html>
