[libsfml] 02/05: Revert "Use dh-exec to force pkgconfig files into the correct multiarch directory"

James Cowgill jcowgill-guest at moszumanska.debian.org
Tue Jun 30 14:21:01 UTC 2015


This is an automated email from the git hooks/post-receive script.

jcowgill-guest pushed a commit to branch master
in repository libsfml.

commit 113c7442471c103fbdc778bdd6b7796e0b088b12
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Fri Jun 26 13:39:56 2015 +0100

    Revert "Use dh-exec to force pkgconfig files into the correct multiarch directory"
    
    My attempt to fix this failed because this path:
     usr/lib*/*/pkgconfig/*
    doesn't match FreeBSD:
     usr/libdata/pkgconfig/...
    
    Since dh_install does not support extended glob, the only way to fix this is a
    patch or some d/rules hacks.
    
    This reverts commit 22e37bd3b6fc449207f284a13bbb01241cab1a62.
---
 debian/control             | 1 -
 debian/libsfml-dev.install | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index d1e8c93..986db95 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Vcs-Git: git://anonscm.debian.org/pkg-games/libsfml.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/libsfml.git
 Build-Depends: debhelper (>= 9),
  cmake (>= 2.8.9),
- dh-exec,
  doxygen,
  libflac-dev,
  libfreetype6-dev,
diff --git a/debian/libsfml-dev.install b/debian/libsfml-dev.install
old mode 100755
new mode 100644
index 9566f27..3851e50
--- a/debian/libsfml-dev.install
+++ b/debian/libsfml-dev.install
@@ -1,5 +1,4 @@
-#!/usr/bin/dh-exec
 usr/include/*
 usr/lib/*/lib*.so
-usr/lib*/*/pkgconfig/* /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+usr/lib/*/pkgconfig/*
 usr/share/SFML/cmake

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/libsfml.git



More information about the Pkg-games-commits mailing list