[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#925876: RFS: libgsm/1.0.18-2 [RC]



On Wed, 27 Mar 2019 13:51:28 -0700, Felix Lechner wrote:

> I am looking for a sponsor for my package "libgsm"

>     dget -x https://mentors.debian.net/debian/pool/main/libg/libgsm/libgsm_1.0.18-2.dsc
> 
>   Changes since the last upload:
> 
>   [ gregor herrmann ]
>   * Fix "unhandled symlink to directory conversion:
>     /usr/share/doc/PACKAGE":
>     add libgsm1-dev.maintscript for the symlink_to_dir transition.
>     (Closes: #919438)
> 
>   [ Felix Lechner ]
>   * Bump Standards-Version to 4.3.0

I had a look at the package, but either I'm doing something wrong or
something went wrong in the update from 1.0.18-1 to -2: The diff
(attached) looks kinda unexpected.


Cheers,
gregor

-- 
 .''`.  https://info.comodo.priv.at -- Debian Developer https://www.debian.org
 : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D  85FA BB3A 6801 8649 AA06
 `. `'  Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe
   `-   
diff -Nru libgsm-1.0.18/debian/changelog libgsm-1.0.18/debian/changelog
--- libgsm-1.0.18/debian/changelog	2019-01-01 00:28:12.000000000 +0100
+++ libgsm-1.0.18/debian/changelog	2019-03-27 21:36:45.000000000 +0100
@@ -1,10 +1,22 @@
+libgsm (1.0.18-2) unstable; urgency=medium
+
+  [ gregor herrmann ]
+  * Fix "unhandled symlink to directory conversion:
+    /usr/share/doc/PACKAGE":
+    add libgsm1-dev.maintscript for the symlink_to_dir transition.
+    (Closes: #919438)
+
+  [ Felix Lechner ]
+  * Bump Standards-Version to 4.3.0
+
+ -- Felix Lechner <felix.lechner@lease-up.com>  Wed, 27 Mar 2019 13:36:45 -0700
+
 libgsm (1.0.18-1) unstable; urgency=medium
 
   * New upstream version
   * New maintainer (Closes: #891760)
-  * Only ship gsm.h, but with an extra link (Closes: #882176)
+  * Only ship gsm.h, but in two locations (Closes: #882176)
   * Migrated rules to dh(1)
-  * Dropped 03_config.patch as suggested in #882176
   * Updated patches (most of 05 was accepted upstream)
   * Bumped shared object version in 01 patch
   * Made copyright file dep5 machine readable
@@ -20,10 +32,10 @@
   * Corrected two misspellings in man via 06 patch
   * Removed duplicate binary control field for section
   * Set Build-Depends: debhelper (>= 11)
-  * Set compat to 12
-  * Updated Standards-Version: 4.3.0
+  * Set compat to 11
+  * Updated Standards-Version: 4.2.1
 
- -- Felix Lechner <felix.lechner@lease-up.com>  Mon, 31 Dec 2018 15:28:12 -0800
+ -- Felix Lechner <felix.lechner@lease-up.com>  Thu, 20 Dec 2018 12:44:25 -0800
 
 libgsm (1.0.13-4) unstable; urgency=low
 
diff -Nru libgsm-1.0.18/debian/compat libgsm-1.0.18/debian/compat
--- libgsm-1.0.18/debian/compat	2019-01-01 00:20:11.000000000 +0100
+++ libgsm-1.0.18/debian/compat	2018-12-19 19:43:44.000000000 +0100
@@ -1 +1 @@
-12
+11
diff -Nru libgsm-1.0.18/debian/control libgsm-1.0.18/debian/control
--- libgsm-1.0.18/debian/control	2019-01-01 00:20:23.000000000 +0100
+++ libgsm-1.0.18/debian/control	2019-03-27 21:11:07.000000000 +0100
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Felix Lechner <felix.lechner@lease-up.com>
 Standards-Version: 4.3.0
-Build-Depends: debhelper (>= 12)
+Build-Depends: debhelper (>= 11)
 Homepage: http://www.quut.com/gsm/
 
 Package: libgsm1
diff -Nru libgsm-1.0.18/debian/libgsm1-dev.install libgsm-1.0.18/debian/libgsm1-dev.install
--- libgsm-1.0.18/debian/libgsm1-dev.install	2019-01-01 00:28:12.000000000 +0100
+++ libgsm-1.0.18/debian/libgsm1-dev.install	2018-12-31 21:38:55.000000000 +0100
@@ -1 +1 @@
-inc/gsm.h usr/include/gsm/
+inc/*.h usr/include/gsm/
diff -Nru libgsm-1.0.18/debian/libgsm1-dev.links libgsm-1.0.18/debian/libgsm1-dev.links
--- libgsm-1.0.18/debian/libgsm1-dev.links	2019-01-01 00:28:12.000000000 +0100
+++ libgsm-1.0.18/debian/libgsm1-dev.links	2018-12-19 23:55:23.000000000 +0100
@@ -1,4 +1,3 @@
-usr/include/gsm/gsm.h usr/include/gsm.h
 usr/share/man/man3/gsm.3 usr/share/man/man3/gsm_create.3
 usr/share/man/man3/gsm.3 usr/share/man/man3/gsm_destroy.3
 usr/share/man/man3/gsm.3 usr/share/man/man3/gsm_decode.3
diff -Nru libgsm-1.0.18/debian/libgsm1-dev.maintscript libgsm-1.0.18/debian/libgsm1-dev.maintscript
--- libgsm-1.0.18/debian/libgsm1-dev.maintscript	1970-01-01 01:00:00.000000000 +0100
+++ libgsm-1.0.18/debian/libgsm1-dev.maintscript	2019-03-27 20:18:35.000000000 +0100
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/libgsm1-dev libgsm1 1.0.18-1.1~
diff -Nru libgsm-1.0.18/debian/patches/03_config.patch libgsm-1.0.18/debian/patches/03_config.patch
--- libgsm-1.0.18/debian/patches/03_config.patch	1970-01-01 01:00:00.000000000 +0100
+++ libgsm-1.0.18/debian/patches/03_config.patch	2018-12-19 19:49:16.000000000 +0100
@@ -0,0 +1,149 @@
+From: Anand Kumria <wildfire@progsoc.org>
+Subject: Add C++ guard to gsm.h
+
+--- a/Makefile
++++ b/Makefile
+@@ -152,7 +152,7 @@ GSM_HEADERS =	$(INC)/gsm.h
+ 
+ HEADERS	=	$(INC)/proto.h		\
+ 		$(INC)/unproto.h	\
+-		$(INC)/config.h		\
++		$(INC)/gsm_config.h	\
+ 		$(INC)/private.h	\
+ 		$(INC)/gsm.h		\
+ 		$(INC)/toast.h		\
+--- a/inc/config.h
++++ /dev/null
+@@ -1,37 +0,0 @@
+-/*
+- * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
+- * Universitaet Berlin.  See the accompanying file "COPYRIGHT" for
+- * details.  THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+- */
+-
+-/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/config.h,v 1.5 1996/07/02 11:26:20 jutta Exp $*/
+-
+-#ifndef	CONFIG_H
+-#define	CONFIG_H
+-
+-/*efine	SIGHANDLER_T	int 		/* signal handlers are void	*/
+-/*efine HAS_SYSV_SIGNAL	1		/* sigs not blocked/reset?	*/
+-
+-#define	HAS_STDLIB_H	1		/* /usr/include/stdlib.h	*/
+-#define	HAS_LIMITS_H	1		/* /usr/include/limits.h	*/
+-#define	HAS_FCNTL_H	1		/* /usr/include/fcntl.h		*/
+-#define	HAS_ERRNO_DECL	1		/* errno.h declares errno	*/
+-
+-#define	HAS_FSTAT 	1		/* fstat syscall		*/
+-#define	HAS_FCHMOD 	1		/* fchmod syscall		*/
+-#define	HAS_CHMOD 	1		/* chmod syscall		*/
+-#define	HAS_FCHOWN 	1		/* fchown syscall		*/
+-#define	HAS_CHOWN 	1		/* chown syscall		*/
+-/*efine	HAS__FSETMODE 	1		/* _fsetmode -- set file mode	*/
+-
+-#define	HAS_STRING_H 	1		/* /usr/include/string.h 	*/
+-/*efine	HAS_STRINGS_H	1		/* /usr/include/strings.h 	*/
+-
+-#define	HAS_UNISTD_H	1		/* /usr/include/unistd.h	*/
+-#define	HAS_UTIME	1		/* POSIX utime(path, times)	*/
+-/*efine	HAS_UTIMES	1		/* use utimes()	syscall instead	*/
+-#define	HAS_UTIME_H	1		/* UTIME header file		*/
+-#define	HAS_UTIMBUF	1		/* struct utimbuf		*/
+-/*efine	HAS_UTIMEUSEC   1		/* microseconds in utimbuf?	*/
+-
+-#endif	/* CONFIG_H */
+--- /dev/null
++++ b/inc/gsm_config.h
+@@ -0,0 +1,37 @@
++/*
++ * Copyright 1992 by Jutta Degener and Carsten Bormann, Technische
++ * Universitaet Berlin.  See the accompanying file "COPYRIGHT" for
++ * details.  THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
++ */
++
++/*$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/config.h,v 1.5 1996/07/02 11:26:20 jutta Exp $*/
++
++#ifndef	CONFIG_H
++#define	CONFIG_H
++
++/*efine	SIGHANDLER_T	int 		-* signal handlers are void	*/
++/*efine HAS_SYSV_SIGNAL	1		-* sigs not blocked/reset?	*/
++
++#define	HAS_STDLIB_H	1		/* /usr/include/stdlib.h	*/
++#define	HAS_STDIO_H 	1		/* /usr/include/stdio.h 	*/
++/*efine	HAS_LIMITS_H	1		-* /usr/include/limits.h	*/
++#define	HAS_FCNTL_H	1		/* /usr/include/fcntl.h		*/
++
++#define	HAS_FSTAT 	1		/* fstat syscall		*/
++#define	HAS_FCHMOD 	1		/* fchmod syscall		*/
++#define	HAS_CHMOD 	1		/* chmod syscall		*/
++#define	HAS_FCHOWN 	1		/* fchown syscall		*/
++#define	HAS_CHOWN 	1		/* chown syscall		*/
++/*efine	HAS__FSETMODE 	1		-* _fsetmode -- set file mode	*/
++
++#define	HAS_STRING_H 	1		/* /usr/include/string.h 	*/
++/*efine	HAS_STRINGS_H	1		-* /usr/include/strings.h 	*/
++
++#define	HAS_UNISTD_H	1		/* /usr/include/unistd.h	*/
++#define	HAS_UTIME	1		/* POSIX utime(path, times)	*/
++/*efine	HAS_UTIMES	1		-* use utimes()	syscall instead	*/
++#define	HAS_UTIME_H	1		/* UTIME header file		*/
++/*efine	HAS_UTIMBUF	1		-* struct utimbuf		*/
++/*efine	HAS_UTIMEUSEC   1		-* microseconds in utimbuf?	*/
++
++#endif	/* CONFIG_H */
+--- a/inc/toast.h
++++ b/inc/toast.h
+@@ -9,7 +9,7 @@
+ #ifndef	TOAST_H
+ #define	TOAST_H				/* Guard against multiple includes */
+ 
+-#include "config.h"
++#include "gsm_config.h"
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+--- a/src/code.c
++++ b/src/code.c
+@@ -6,7 +6,7 @@
+ 
+ /* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/code.c,v 1.3 1996/07/02 09:59:05 jutta Exp $ */
+ 
+-#include	"config.h"
++#include	"gsm_config.h"
+ 
+ 
+ #ifdef	HAS_STRING_H
+--- a/src/gsm_create.c
++++ b/src/gsm_create.c
+@@ -6,7 +6,7 @@
+ 
+ static char const	ident[] = "$Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_create.c,v 1.4 1996/07/02 09:59:05 jutta Exp $";
+ 
+-#include	"config.h"
++#include	"gsm_config.h"
+ 
+ #ifdef	HAS_STRING_H
+ #include	<string.h>
+--- a/src/gsm_destroy.c
++++ b/src/gsm_destroy.c
+@@ -7,7 +7,7 @@
+ /* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/gsm_destroy.c,v 1.3 1994/11/28 19:52:25 jutta Exp $ */
+ 
+ #include "gsm.h"
+-#include "config.h"
++#include "gsm_config.h"
+ #include "proto.h"
+ 
+ #ifdef	HAS_STDLIB_H
+--- a/tls/taste.c
++++ b/tls/taste.c
+@@ -10,7 +10,7 @@
+ #include	<string.h>
+ #include	<memory.h>
+ 
+-#include	"config.h"
++#include	"gsm_config.h"
+ 
+ #ifdef	HAS_STDLIB_H
+ #	include	<stdlib.h>
diff -Nru libgsm-1.0.18/debian/patches/series libgsm-1.0.18/debian/patches/series
--- libgsm-1.0.18/debian/patches/series	2019-01-01 00:24:32.000000000 +0100
+++ libgsm-1.0.18/debian/patches/series	2012-04-12 17:22:53.000000000 +0200
@@ -1,5 +1,6 @@
 01_makefile.patch
 02_cplusplus.patch
+03_config.patch
 04_includes.patch
 05_compiler_warnings.patch
 06_fix_manpages.patch

Attachment: signature.asc
Description: Digital Signature


Reply to: