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

[Git][debian-mate-team/mate-polkit][master] 11 commits: Split-out mate-polkit-bin as separate bin:pkg. Resolves architecture mismatch...



Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / mate-polkit

Commits:

  • 080b10c7
    by Thomas Uhle at 2022-11-18T22:45:02+01:00
    Split-out mate-polkit-bin as separate bin:pkg. Resolves architecture mismatch when executing the polkit agent executable. (Closes: #1006996).
    
  • 0ac37887
    by Mike Gabriel at 2022-11-18T22:52:32+01:00
    debian/control: Add B:/R: for mate-polkit / mate-polkit-common as we moved the XDG autostart file from common:pkg to bin:pkg.
    
  • 1dc088e9
    by Mike Gabriel at 2022-11-18T22:53:25+01:00
    debian/control: Make sure we have exactly the right common:pkg installed. Don't allow any newer version of the common:pkg.
    
  • f8e3f69e
    by Mike Gabriel at 2023-04-25T14:43:21+02:00
    Revert "debian/control: Make sure we have exactly the right common:pkg installed. Don't allow any newer version of the common:pkg."
    
    This reverts commit 1dc088e9b530dccef71b4f24693b8c89e82d99b8.
    
  • 8845c8ec
    by Mike Gabriel at 2023-04-25T14:43:22+02:00
    Revert "debian/control: Add B:/R: for mate-polkit / mate-polkit-common as we moved the XDG autostart file from common:pkg to bin:pkg."
    
    This reverts commit 0ac37887476a9f0a2749b28e0b8f56a8adf36bb2.
    
  • 074f2260
    by Mike Gabriel at 2023-04-25T14:43:23+02:00
    Revert "Split-out mate-polkit-bin as separate bin:pkg. Resolves architecture mismatch when executing the polkit agent executable. (Closes: #1006996)."
    
    This reverts commit 080b10c772560519dc82fd1d1d2643ab82939273.
    
  • fa9d0d1b
    by Thomas Uhle at 2023-04-25T13:12:05+00:00
    debian/: Move polkit-agent executable to /usr/libexec directory. Move man page into mate-polkit-bin bin:pkg. (Closes: #1006996).
    
  • 40b483a0
    by Thomas Uhle at 2023-04-25T13:12:05+00:00
    debian/rules: Drop duplicate --disable-silent-rules from configure run.
    
  • 68e57945
    by Mike Gabriel at 2023-04-25T13:13:19+00:00
    debian/control: Switch from D: policykit-1 (deprecated) to polkitd. (Closes: #1025598).
    
  • 5283fc23
    by Mike Gabriel at 2023-04-25T15:21:04+02:00
    debian/copyright: Update copyright attributions for debian/.
    
  • c982ef2d
    by Mike Gabriel at 2023-04-25T15:28:04+02:00
    upload to unstable (debian/1.26.1-2)
    

8 changed files:

Changes:

  • debian/bin/mate-polkit
    1
    +#!/bin/sh
    
    2
    +
    
    3
    +/usr/libexec/polkit-mate-authentication-agent-1 &

  • debian/bin/mate-polkit.in deleted
    1
    -#!/bin/sh
    
    2
    -
    
    3
    -/usr/lib/@DEB_HOST_MULTIARCH@/polkit-mate/polkit-mate-authentication-agent-1 &

  • debian/changelog
    1
    +mate-polkit (1.26.1-2) unstable; urgency=medium
    
    2
    +
    
    3
    +  [ Thomas Uhle ]
    
    4
    +  * debian/:
    
    5
    +    + Move polkit-agent executable to /usr/libexec directory. Move man page
    
    6
    +      into mate-polkit-bin bin:pkg. (Closes: #1006996). Re-adjust inter-package
    
    7
    +      relations and bin:pkg architecture declarations. Remove remnants of this
    
    8
    +      package being a shared library once (i.e. drop Multi-Arch: fields).
    
    9
    +  * debian/rules:
    
    10
    +    + Drop duplicate --disable-silent-rules from configure run.
    
    11
    +
    
    12
    +  [ Mike Gabriel ]
    
    13
    +  * debian/control:
    
    14
    +    + Switch from D: policykit-1 (deprecated) to polkitd. (Closes: #1025598).
    
    15
    +  * debian/copyright:
    
    16
    +    + Update copyright attributions for debian/.
    
    17
    +
    
    18
    + -- Mike Gabriel <sunweaver@debian.org>  Tue, 25 Apr 2023 13:15:11 +0000
    
    19
    +
    
    1 20
     mate-polkit (1.26.1-1) unstable; urgency=medium
    
    2 21
     
    
    3 22
       * New upstream release.
    

  • debian/control
    ... ... @@ -26,7 +26,8 @@ Package: mate-polkit-bin
    26 26
     Architecture: all
    
    27 27
     Depends: mate-polkit (>= ${source:Version}),
    
    28 28
              ${misc:Depends},
    
    29
    -Breaks: mate-polkit (<< 1.12.0-3~),
    
    29
    +Breaks: mate-polkit (<< 1.26.1-2~),
    
    30
    +Replaces: mate-polkit (<< 1.26.1-2~),
    
    30 31
     Description: MATE authentication agent for PolicyKit-1 (executable wrapper script)
    
    31 32
      The mate-polkit package provides a D-Bus session bus service that is used to
    
    32 33
      bring up authentication dialogs used for obtaining privileges.
    
    ... ... @@ -40,10 +41,9 @@ Description: MATE authentication agent for PolicyKit-1 (executable wrapper scrip
    40 41
     
    
    41 42
     Package: mate-polkit
    
    42 43
     Architecture: any
    
    43
    -Multi-Arch: same
    
    44 44
     Depends: accountsservice,
    
    45
    -         mate-polkit-common (= ${binary:Version}),
    
    46
    -         policykit-1,
    
    45
    +         mate-polkit-common (>= ${source:Version}),
    
    46
    +         polkitd,
    
    47 47
              ${misc:Depends},
    
    48 48
              ${shlibs:Depends},
    
    49 49
     Provides: polkit-1-auth-agent,
    
    ... ... @@ -54,10 +54,8 @@ Description: MATE authentication agent for PolicyKit-1
    54 54
      This package contains the MATE policy kit authentication agent.
    
    55 55
     
    
    56 56
     Package: mate-polkit-common
    
    57
    -Architecture: any
    
    58
    -Multi-Arch: foreign
    
    57
    +Architecture: all
    
    59 58
     Depends: ${misc:Depends},
    
    60
    -         ${shlibs:Depends},
    
    61 59
     Breaks: mate-polkit (<< 1.8.0),
    
    62 60
     Description: MATE authentication agent for PolicyKit-1 (common files)
    
    63 61
      The mate-polkit package provides a D-Bus session bus service that is used to
    

  • debian/copyright
    ... ... @@ -113,8 +113,8 @@ Copyright: 2009, Red Hat, Inc.
    113 113
     License: public-domain
    
    114 114
     
    
    115 115
     Files: debian/*
    
    116
    -Copyright: 2011-2014 Stefano Karapetsas <stefano@karapetsas.com>
    
    117
    -           2014 Mike Gabriel <sunweaver@debian.org>
    
    116
    +Copyright: 2011-2014, Stefano Karapetsas <stefano@karapetsas.com>
    
    117
    +           2014-2023, Mike Gabriel <sunweaver@debian.org>
    
    118 118
     License: LGPL-2+
    
    119 119
     
    
    120 120
     License: LGPL-2+
    

  • debian/mate-polkit.manpagesdebian/mate-polkit-bin.manpages

  • debian/mate-polkit.install
    1
    -usr/lib/*/polkit-mate/
    1
    +usr/libexec/

  • debian/rules
    ... ... @@ -17,11 +17,10 @@ DEB_INSTALL_DOCS_ALL = README AUTHORS HACKING
    17 17
     
    
    18 18
     DEB_CONFIGURE_SCRIPT := ./autogen.sh
    
    19 19
     
    
    20
    -DEB_CONFIGURE_EXTRA_FLAGS := --disable-silent-rules \
    
    21
    -                             --localstatedir=/var \
    
    20
    +DEB_CONFIGURE_EXTRA_FLAGS := --localstatedir=/var \
    
    22 21
                                  --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
    
    23 22
                                  --includedir=/usr/include/$(DEB_HOST_MULTIARCH) \
    
    24
    -                             --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/polkit-mate \
    
    23
    +                             --libexecdir=/usr/libexec \
    
    25 24
                                  --disable-silent-rules \
    
    26 25
                                  --disable-static \
    
    27 26
                                  --enable-gtk-doc
    
    ... ... @@ -35,7 +34,7 @@ remove-cruft::
    35 34
     
    
    36 35
     install-wrapper::
    
    37 36
     	mkdir -p debian/tmp/usr/bin/
    
    38
    -	sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' < debian/bin/mate-polkit.in > debian/tmp/usr/bin/mate-polkit
    
    37
    +	cp -p debian/bin/mate-polkit debian/tmp/usr/bin/mate-polkit
    
    39 38
     
    
    40 39
     get-orig-source:
    
    41 40
     	uscan --noconf --force-download --rename --download-current-version --destdir=..


  • Reply to: