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

[Git][debian-mate-team/caja-seahorse][master] 3 commits: debian/patches: Add 1010_gpgme_pkgconfig.diff: Use pkgconfig to locate gpgme...

Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / caja-seahorse

Commits:

  • ebecbe46
    by Mike Gabriel at 2022-11-13T20:44:05+01:00 
    debian/patches: Add 1010_gpgme_pkgconfig.diff: Use pkgconfig to locate gpgme instead of gpgme-config fixing FTBFS with libgpgme-dev >= 1.18.0-2. (Closes: #1023868).
  • 2fb19b70
    by Mike Gabriel at 2022-11-13T20:44:57+01:00 
    debian/control: Bump Standards-Version: to 4.6.1. No changes needed.
  • 7848bea2
    by Mike Gabriel at 2022-11-13T21:05:23+01:00 
    upload to unstable (debian/1.18.5-2)

4 changed files:

Changes:

  • debian/changelog
    1 
    +caja-seahorse (1.18.5-2) unstable; urgency=medium
    2 
    +
    3 
    +  [ Andreas Metzler ]
    4 
    +  * debian/patches:
    5 
    +    + Add 1010_gpgme_pkgconfig.diff: Use pkgconfig to locate gpgme instead of
    6 
    +      gpgme-config fixing FTBFS with libgpgme-dev >= 1.18.0-2. (Closes:
    7 
    +      #1023868).
    8 
    +
    9 
    +  [ Mike Gabriel ]
    10 
    +  * debian/control:
    11 
    +    + Bump Standards-Version: to 4.6.1. No changes needed.
    12 
    +
    13 
    + -- Mike Gabriel <sunweaver@debian.org>  Sun, 13 Nov 2022 20:45:07 +0100
    14 
    +
    1 15 
     caja-seahorse (1.18.5-1) unstable; urgency=medium
    2 16
    3 17 
       [ Simon Quigley ]

  • debian/control
    ... ... @@ -18,7 +18,7 @@ Build-Depends: debhelper-compat (= 13),
    18 18 
                    libgtk-3-dev (>= 3.10),
    19 19 
                    libnotify-dev,
    20 20 
                    mate-common
    21 
    -Standards-Version: 4.6.0
    21 
    +Standards-Version: 4.6.1
    22 22 
     Rules-Requires-Root: no
    23 23 
     Homepage: https://github.com/darkshram/seahorse-caja
    24 24 
     Vcs-Git: https://salsa.debian.org/debian-mate-team/caja-seahorse.git

  • debian/patches/1010_gpgme_pkgconfig.diff
    1 
    +Description: Use pkgconfig to locate gpgme instead of gpgme-config.
    2 
    +Author: Andreas Metzler <ametzler@debian.org>
    3 
    +Origin: vendor
    4 
    +Last-Update: 2022-11-11
    5 
    +
    6 
    +--- a/configure.ac
    7 
    ++++ b/configure.ac
    8 
    +@@ -85,45 +85,11 @@
    9 
    + 	else
    10 
    + 		AC_MSG_ERROR([Appropriate version of GnuPG not found. Please install one of versions: $accepted_versions])
    11 
    + 	fi
    12 
    + fi
    13 
    +
    14 
    +-ok="no"
    15 
    +-min_gpgme_version=1.0.0
    16 
    +-AC_PATH_PROG(GPGME_CONFIG, gpgme-config, "failed")
    17 
    +-if test $GPGME_CONFIG != "failed" ; then
    18 
    +-	AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
    19 
    +-	req_major=`echo $min_gpgme_version | \
    20 
    +-		sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
    21 
    +-	req_minor=`echo $min_gpgme_version | \
    22 
    +-		sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
    23 
    +-	req_micro=`echo $min_gpgme_version | \
    24 
    +-		sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
    25 
    +-	gpgme_config_version=`$GPGME_CONFIG --version`
    26 
    +-	major=`echo $gpgme_config_version | \
    27 
    +-		sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
    28 
    +-	minor=`echo $gpgme_config_version | \
    29 
    +-		sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
    30 
    +-	micro=`echo $gpgme_config_version | \
    31 
    +-		sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
    32 
    +-
    33 
    +-	if test "$major" -eq "$req_major"; then
    34 
    +-		if test "$minor" -ge "$req_minor"; then
    35 
    +-			if test "$micro" -ge "$req_micro"; then
    36 
    +-				ok="yes"
    37 
    +-			fi
    38 
    +-		fi
    39 
    +-	fi
    40 
    +-fi
    41 
    +-
    42 
    +-if test $ok = "yes"; then
    43 
    +-	GPGME_CFLAGS=`$GPGME_CONFIG --cflags`
    44 
    +-	GPGME_LIBS=`$GPGME_CONFIG --libs`
    45 
    +-	AC_MSG_RESULT(yes)
    46 
    +-else
    47 
    +-	AC_MSG_ERROR(GPGME $min_gpgme_version or later needed)
    48 
    +-fi
    49 
    ++PKG_CHECK_MODULES([GPGME], [gpgme >= 1.0.0])
    50 
    +
    51 
    + SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GPGME_CFLAGS"
    52 
    + SEAHORSE_LIBS="$SEAHORSE_LIBS $GPGME_LIBS"
    53 
    +
    54 
    + # -----------------------------------------------------------------------------

  • debian/patches/series
    1 
    +1010_gpgme_pkgconfig.diff

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: