Merge pull request #101 from kapouer/debian-prdebian

Synchronize with debian package

5 files changed, 30 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index 1f7b827..2d2b85c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libepoxy (1.4.0-1) UNRELEASED; urgency=medium
+
+  * New upstream version 1.4.0.
+  * Standards-Version 3.9.8
+  * B-D python:native for cross-build. Closes: #842711.
+  * Build libepoxy0-udeb so libgtk-3-0-udeb can depend on it. Closes: #788711
+  * Executable bit on rules
+  * Section: debian-installer for udeb
+  * Copyright: factor Expat license
+
+ -- Jérémy Lal <kapouer@melix.org>  Mon, 30 Jan 2017 15:00:33 +0100
+
 libepoxy (1.3.1-1) unstable; urgency=low
 
   * Upgrade to upstream v1.3.1 release and make the -dev package multi-arch.
diff --git a/debian/control b/debian/control
index 3b0b7d6..96934fa 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: libepoxy
 Priority: optional
-Maintainer: Eric Anholt <eric@anholt.net>
+Maintainer: Jérémy Lal <kapouer@melix.org>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                autotools-dev,
@@ -8,8 +8,8 @@ Build-Depends: debhelper (>= 9),
                pkg-config,
                libx11-dev,
                libegl1-mesa-dev,
-               python
-Standards-Version: 3.9.6
+               python:native
+Standards-Version: 3.9.8
 Section: libs
 Homepage: https://github.com/anholt/libepoxy
 Vcs-Git: https://github.com/anholt/libepoxy.git
@@ -39,3 +39,11 @@ Description: OpenGL function pointer management library
  eglGetProcAddress(), etc. from the app developer, with very little
  knowledge needed on their part.  They get to read GL specs and write
  code using undecorated function names like glCompileShader().
+
+Package: libepoxy0-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenGL function pointer management library - minimal runtime
+ This is a udeb, or a microdeb, for the debian-installer.
diff --git a/debian/copyright b/debian/copyright
index f559237..dc26ed5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,28 +5,12 @@ Source: https://github.com/anholt/libepoxy
 Files: *
 Copyright: 2013-2014 Intel Corporation
 License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice (including the next
- paragraph) shall be included in all copies or substantial portions of the
- Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- IN THE SOFTWARE.
 
 Files: registry/*
 Copyright: 2013 The Khronos Group Inc.
 License: Expat
+
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and/or associated documentation files (the
  "Materials"), to deal in the Materials without restriction, including
diff --git a/debian/libepoxy0-udeb.install b/debian/libepoxy0-udeb.install
new file mode 100644
index 0000000..3ddde58
--- /dev/null
+++ b/debian/libepoxy0-udeb.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 4674147..d93a0d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,3 +6,7 @@
 # Running make check is unsuitable because the tests require a working
 # X environment currently, so we disable dh_auto_test.
 override_dh_auto_test:
+
+# No symbols for udebs, specify the highest version from symbols file:
+override_dh_makeshlibs:
+	dh_makeshlibs --add-udeb='libepoxy0-udeb (>= 1.3)'