Control: tags 1072278 + pending

Dear maintainer,

I've prepared an NMU for scute (versioned as 1:1.5.0-1.2) and
uploaded it to sid.

Kind regards
Andreas
diff -Nru scute-1.5.0/debian/changelog scute-1.5.0/debian/changelog
--- scute-1.5.0/debian/changelog	2022-11-19 23:06:15.000000000 +0100
+++ scute-1.5.0/debian/changelog	2024-08-15 09:51:15.000000000 +0200
@@ -1,3 +1,10 @@
+scute (1:1.5.0-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Also remove old copy of m4/libassuan.m4. Closes: #1072278
+
+ -- Andreas Metzler <[email protected]>  Thu, 15 Aug 2024 09:51:15 +0200
+
 scute (1:1.5.0-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru scute-1.5.0/debian/patches/rm_old_libassuan.m4.diff scute-1.5.0/debian/patches/rm_old_libassuan.m4.diff
--- scute-1.5.0/debian/patches/rm_old_libassuan.m4.diff	1970-01-01 01:00:00.000000000 +0100
+++ scute-1.5.0/debian/patches/rm_old_libassuan.m4.diff	2024-08-15 09:51:15.000000000 +0200
@@ -0,0 +1,85 @@
+Description: Remove old copy of m4/libassuan.m4.
+Author: Andreas Metzler <[email protected]>
+Bug-Debian: https://bugs.debian.org/1072278
+Origin: vendor
+Last-Update: 2024-08-15
+
+--- scute-1.5.0.orig/m4/libassuan.m4
++++ /dev/null
+@@ -1,76 +0,0 @@
+-dnl Autoconf macros for libassuan
+-dnl       Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+-dnl
+-dnl This file is free software; as a special exception the author gives
+-dnl unlimited permission to copy and/or distribute it, with or without
+-dnl modifications, as long as this notice is preserved.
+-dnl
+-dnl This file is distributed in the hope that it will be useful, but
+-dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+-dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+-
+-
+-dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION,
+-dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+-dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
+-dnl
+-AC_DEFUN([AM_PATH_LIBASSUAN],
+-[ AC_ARG_WITH(libassuan-prefix,
+-            AC_HELP_STRING([--with-libassuan-prefix=PFX],
+-                           [prefix where LIBASSUAN is installed (optional)]),
+-     libassuan_config_prefix="$withval", libassuan_config_prefix="")
+-  if test x$libassuan_config_prefix != x ; then
+-     libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
+-     if test x${LIBASSUAN_CONFIG+set} != xset ; then
+-        LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
+-     fi
+-  fi
+-
+-  AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
+-  min_libassuan_version=ifelse([$1], ,0.0.1,$1)
+-  AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
+-  ok=no
+-  if test "$LIBASSUAN_CONFIG" != "no" ; then
+-    req_major=`echo $min_libassuan_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+-    req_minor=`echo $min_libassuan_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+-    req_micro=`echo $min_libassuan_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+-    libassuan_config_version=`$LIBASSUAN_CONFIG $libassuan_config_args --version`
+-    major=`echo $libassuan_config_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+-    minor=`echo $libassuan_config_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+-    micro=`echo $libassuan_config_version | \
+-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+-    if test "$major" -gt "$req_major"; then
+-        ok=yes
+-    else 
+-        if test "$major" -eq "$req_major"; then
+-            if test "$minor" -gt "$req_minor"; then
+-               ok=yes
+-            else
+-               if test "$minor" -eq "$req_minor"; then
+-                   if test "$micro" -ge "$req_micro"; then
+-                     ok=yes
+-                   fi
+-               fi
+-            fi
+-        fi
+-    fi
+-  fi
+-  if test $ok = yes; then
+-    LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
+-    LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
+-    AC_MSG_RESULT(yes)
+-    ifelse([$2], , :, [$2])
+-  else
+-    LIBASSUAN_CFLAGS=""
+-    LIBASSUAN_LIBS=""
+-    AC_MSG_RESULT(no)
+-    ifelse([$3], , :, [$3])
+-  fi
+-  AC_SUBST(LIBASSUAN_CFLAGS)
+-  AC_SUBST(LIBASSUAN_LIBS)
+-])
diff -Nru scute-1.5.0/debian/patches/series scute-1.5.0/debian/patches/series
--- scute-1.5.0/debian/patches/series	2019-01-16 05:23:05.000000000 +0100
+++ scute-1.5.0/debian/patches/series	2024-08-15 09:51:15.000000000 +0200
@@ -1,2 +1,3 @@
 scute.git-8b01c156.patch
 scute.git-f31e6af6.patch
+rm_old_libassuan.m4.diff

Attachment: signature.asc
Description: PGP signature

Reply via email to