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

[Git][debian-mate-team/mate-polkit][master] 3 commits: debian/rules: Fix build/host confusion. (Closes: #913416).



Title: GitLab

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

Commits:

4 changed files:

Changes:

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

  • debian/changelog
    1
    +mate-polkit (1.20.1-2) unstable; urgency=medium
    
    2
    +
    
    3
    +  [ Helmut Grohne ]
    
    4
    +  * debian/rules: Fix build/host confusion. (Closes: #913416).
    
    5
    +
    
    6
    + -- Mike Gabriel <sunweaver@debian.org>  Sun, 11 Nov 2018 15:56:48 +0100
    
    7
    +
    
    1 8
     mate-polkit (1.20.1-1) unstable; urgency=medium
    
    2 9
     
    
    3 10
       * New upstream release.
    

  • debian/control
    ... ... @@ -15,7 +15,7 @@ Build-Depends: cdbs,
    15 15
                    libpolkit-gobject-1-dev,
    
    16 16
                    mate-common (>= 1.18),
    
    17 17
                    pkg-config,
    
    18
    -Standards-Version: 4.1.4
    
    18
    +Standards-Version: 4.3.0
    
    19 19
     Homepage: http://www.mate-desktop.org/
    
    20 20
     Vcs-Browser: https://salsa.debian.org/debian-mate-team/mate-polkit
    
    21 21
     Vcs-Git: https://salsa.debian.org/debian-mate-team/mate-polkit.git
    

  • debian/rules
    1 1
     #!/usr/bin/make -f
    
    2 2
     
    
    3
    +include /usr/share/dpkg/architecture.mk
    
    3 4
     include /usr/share/cdbs/1/class/autotools.mk
    
    4 5
     include /usr/share/cdbs/1/rules/debhelper.mk
    
    5 6
     include /usr/share/cdbs/1/rules/utils.mk
    
    ... ... @@ -20,9 +21,9 @@ DEB_CONFIGURE_SCRIPT := ./autogen.sh
    20 21
     
    
    21 22
     DEB_CONFIGURE_EXTRA_FLAGS := --disable-silent-rules \
    
    22 23
                                  --localstatedir=/var \
    
    23
    -                             --libdir=/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) \
    
    24
    -                             --includedir=/usr/include/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) \
    
    25
    -                             --libexecdir=/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/polkit-mate \
    
    24
    +                             --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
    
    25
    +                             --includedir=/usr/include/$(DEB_HOST_MULTIARCH) \
    
    26
    +                             --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/polkit-mate \
    
    26 27
                                  --disable-silent-rules \
    
    27 28
                                  --disable-static \
    
    28 29
                                  --enable-gtk-doc
    
    ... ... @@ -36,7 +37,7 @@ remove-cruft::
    36 37
     
    
    37 38
     install-wrapper::
    
    38 39
     	mkdir -p debian/tmp/usr/bin/
    
    39
    -	cat debian/bin/mate-polkit.in  | sed -e 's/@BUILD_ARCH@/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/' > debian/tmp/usr/bin/mate-polkit
    
    40
    +	sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' < debian/bin/mate-polkit.in > debian/tmp/usr/bin/mate-polkit
    
    40 41
     
    
    41 42
     get-orig-source:
    
    42 43
     	uscan --noconf --force-download --rename --download-current-version --destdir=..


  • Reply to: