From b598517b7e50976a0b9c9656d2aafc5cb52bc7b9 Mon Sep 17 00:00:00 2001 From: Nicholas Guriev Date: Fri, 14 Apr 2017 03:40:26 +0300 Subject: [PATCH] New upstream version --- debian/changelog | 8 ++++++++ debian/compat | 2 +- debian/control | 14 +++----------- debian/freeglut3-dev.install | 1 + debian/freeglut3.install | 2 +- debian/patches/03_fix_hurd.diff | 13 ------------- debian/patches/06_fix_FTBFS_kFreeBSD.patch | 10 +++++----- debian/patches/07_HOME-fixed-buffer.patch | 10 +++++----- debian/patches/series | 1 - debian/rules | 6 +----- 10 files changed, 25 insertions(+), 42 deletions(-) delete mode 100644 debian/patches/03_fix_hurd.diff diff --git a/debian/changelog b/debian/changelog index 9225f32..ef6bd96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +freeglut (3.0.0-0ubuntu1) zesty; urgency=low + + * New upstream release (closes: #859687). + - Refresh patches, remove 03_fix_hurd.diff + * Bump debhelper version. + + -- Nicholas Guriev Mon, 17 Apr 2017 12:03:32 +0300 + freeglut (2.8.1-3) unstable; urgency=medium * [1ee10b3] Update gitignore. diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 8bee492..d673bc0 100644 --- a/debian/control +++ b/debian/control @@ -3,20 +3,14 @@ Maintainer: Anton Gladky Section: graphics Testsuite: autopkgtest Priority: optional -Build-Depends: autoconf, - automake, - autotools-dev, - debhelper (>= 9), - dh-autoreconf, +Build-Depends: cmake (>=2.8.8), + debhelper (>= 10), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, - libtool, libusbhid-dev [kfreebsd-any], libx11-dev, - libxext-dev, libxi-dev, - libxt-dev, - libxxf86vm-dev [amd64 i386] + libxrandr-dev Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/freeglut.git Vcs-Git: https://anonscm.debian.org/git/collab-maint/freeglut.git @@ -46,8 +40,6 @@ Section: libdevel Depends: freeglut3 (= ${binary:Version}), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, - libxext-dev, - libxt-dev, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Description: OpenGL Utility Toolkit development files diff --git a/debian/freeglut3-dev.install b/debian/freeglut3-dev.install index 78c73b8..a295728 100644 --- a/debian/freeglut3-dev.install +++ b/debian/freeglut3-dev.install @@ -4,3 +4,4 @@ usr/include/GL/freeglut_std.h usr/include/GL/glut.h usr/lib/*/libglut.a usr/lib/*/libglut.so +usr/lib/*/pkgconfig/freeglut.pc diff --git a/debian/freeglut3.install b/debian/freeglut3.install index af9ec47..c165e3f 100644 --- a/debian/freeglut3.install +++ b/debian/freeglut3.install @@ -1,2 +1,2 @@ usr/lib/*/libglut.so.3 -usr/lib/*/libglut.so.3.9.0 +usr/lib/*/libglut.so.3.10.0 diff --git a/debian/patches/03_fix_hurd.diff b/debian/patches/03_fix_hurd.diff deleted file mode 100644 index 06a1dd3..0000000 --- a/debian/patches/03_fix_hurd.diff +++ /dev/null @@ -1,13 +0,0 @@ -Description: fix compilation on hurd - ---- a/src/freeglut_joystick.c -+++ b/src/freeglut_joystick.c -@@ -1095,6 +1095,8 @@ - joy->num_axes = joy->num_buttons = 0; - joy->name[ 0 ] = '\0'; - -+ i = 0; -+ - #if TARGET_HOST_MACINTOSH - /* XXX FIXME: get joystick name in Mac */ - diff --git a/debian/patches/06_fix_FTBFS_kFreeBSD.patch b/debian/patches/06_fix_FTBFS_kFreeBSD.patch index 9fe5d2b..0e5b65e 100644 --- a/debian/patches/06_fix_FTBFS_kFreeBSD.patch +++ b/debian/patches/06_fix_FTBFS_kFreeBSD.patch @@ -3,9 +3,9 @@ Author: Anton Gladky Applied-Upstream: https://svn.redports.org/gahr/graphics/freeglut/freeglut-2.8.0.diff Last-Update: 2012-11-19 ---- a/src/freeglut_joystick.c -+++ b/src/freeglut_joystick.c -@@ -152,7 +152,11 @@ +--- a/src/fg_joystick.c ++++ b/src/fg_joystick.c +@@ -60,7 +60,11 @@ # include # endif # endif @@ -18,7 +18,7 @@ Last-Update: 2012-11-19 # include /* Compatibility with older usb.h revisions */ -@@ -199,6 +203,7 @@ +@@ -107,6 +111,7 @@ struct os_specific_s { */ static char *fghJoystickWalkUSBdev(int f, char *dev, char *out, int outlen) { @@ -26,7 +26,7 @@ Last-Update: 2012-11-19 struct usb_device_info di; int i, a; char *cp; -@@ -220,6 +225,7 @@ +@@ -128,6 +133,7 @@ static char *fghJoystickWalkUSBdev(int f return out; } } diff --git a/debian/patches/07_HOME-fixed-buffer.patch b/debian/patches/07_HOME-fixed-buffer.patch index f5d5646..d7b6a19 100644 --- a/debian/patches/07_HOME-fixed-buffer.patch +++ b/debian/patches/07_HOME-fixed-buffer.patch @@ -4,10 +4,10 @@ Reviewed-by: Anton Gladky Bug-Debian: http://bugs.debian.org/430160 Last-Update: 2012-11-19 ---- a/src/freeglut_joystick.c -+++ b/src/freeglut_joystick.c -@@ -1339,7 +1339,8 @@ - if( joy->os->is_analog ) +--- a/src/x11/fg_joystick_x11.c ++++ b/src/x11/fg_joystick_x11.c +@@ -250,7 +250,8 @@ void fgPlatformJoystickOpen( SFG_Joystic + if( joy->pJoystick.os->is_analog ) { FILE *joyfile; - char joyfname[ 1024 ]; @@ -16,7 +16,7 @@ Last-Update: 2012-11-19 int noargs, in_no_axes; float axes [ _JS_MAX_AXES ]; -@@ -1353,9 +1354,17 @@ +@@ -264,9 +265,17 @@ void fgPlatformJoystickOpen( SFG_Joystic if( joy->error ) return; diff --git a/debian/patches/series b/debian/patches/series index 2aa5827..cc050f0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -03_fix_hurd.diff 06_fix_FTBFS_kFreeBSD.patch 07_HOME-fixed-buffer.patch diff --git a/debian/rules b/debian/rules index 430f322..d988deb 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,10 @@ #!/usr/bin/make -f %: - dh $@ --parallel --with autoreconf + dh $@ export DEB_BUILD_MAINT_OPTIONS := hardening=+all override_dh_auto_configure: dh_auto_configure sed -i '18d' $(CURDIR)/doc/index.html # Clean from non-free logo - -override_dh_auto_install-arch: - dh_auto_install -a - find . -name '*.la' -print0 | xargs -0 rm -f -- 2.7.4