I'd like to make the package with new upstream version. I already
started work on my patch. But right now I have some troubles: all tests
fail :(
The error is the same for each test:
adt-run [04:03:07]: test build2: [---
bash: /dev/fd/62: No such file or directory
adt-run [04:03:08]: test build2: ---]
adt-run [04:03:08]: test build2: - - - - - - - - - - results - -
- - - - - - - -
build2 FAIL non-zero exit status 1
adt-run [04:03:08]: test build3: preparing testbed
...
I run adt-run using plain chroot under root. Any ideas?
So far, I did the following modifications. Note I'm beginner and not a
Debian Developer so this patch may contain some mistakes. But I hope
they are very few.
>From 40c52d9c421602a032af31a27c8d30ef501ccebb 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 | 9 +
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, 26 insertions(+), 42 deletions(-)
delete mode 100644 debian/patches/03_fix_hurd.diff
diff --git a/debian/changelog b/debian/changelog
index 9225f32..ba5b5ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+freeglut (3.0.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * New upstream release (closes: 859687)
+- Refresh patches, remove 03_fix_hurd.diff
+ * Bump debhelper version
+
+ -- Nicholas Guriev Fri, 14 Apr 2017 03:05:41 +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..000
--- 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..35e1a11 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: