Control: tags -1 pending Hi,
I have uploaded an NMU to DELAYED/10 to fix the following bugs. Please tell me if I should cancel / delay it. #817778 silkscreen font is not DFSG compliant #826288 info-beamer: please use glfw3 The NMU debdiff is attached. As part of the upload, the .git directory from the original tarball was removed (since it will also contain a non-dfsg copy of silkscreen). To avoid loads of cruft appearing in the debdiff, I generated it using --exclude='\.git' I have also uploaded it to mentors so you can get a copy of the new orig tarball if you want. https://mentors.debian.net/debian/pool/main/i/info-beamer/info-beamer_1.0~pre3+dfsg-0.1.dsc Thanks, James
diff -Nru --exclude '\.git' info-beamer-1.0~pre3/debian/changelog info-beamer-1.0~pre3+dfsg/debian/changelog --- info-beamer-1.0~pre3/debian/changelog 2016-03-06 21:31:10.000000000 +0000 +++ info-beamer-1.0~pre3+dfsg/debian/changelog 2016-06-29 01:48:16.000000000 +0100 @@ -1,3 +1,15 @@ +info-beamer (1.0~pre3+dfsg-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * Remove non-free silkscreen.ttf font. (Closes: #817778) + - Also remove .git folder from upstream tarball which is likely to + contain copy of the font. + * Remove use of git from the build system. + - It no longer works after the .git directory was removed. + * Port to GLFW 3. (Closes: #826288) + + -- James Cowgill <jcowg...@debian.org> Wed, 29 Jun 2016 01:46:17 +0100 + info-beamer (1.0~pre3-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru --exclude '\.git' info-beamer-1.0~pre3/debian/control info-beamer-1.0~pre3+dfsg/debian/control --- info-beamer-1.0~pre3/debian/control 2015-01-16 10:56:16.000000000 +0000 +++ info-beamer-1.0~pre3+dfsg/debian/control 2016-06-29 00:39:23.000000000 +0100 @@ -2,7 +2,7 @@ Section: misc Priority: optional Maintainer: Noël Köthe <n...@debian.org> -Build-Depends: debhelper (>= 9), liblua5.1-dev, libevent-dev, libglfw-dev, libglew1.5-dev, libftgl-dev, libavcodec-dev, libswscale-dev, libavformat-dev, libdevil-dev, lua5.1, git +Build-Depends: debhelper (>= 9), liblua5.1-dev, libevent-dev, libglfw3-dev, libglew1.5-dev, libftgl-dev, libavcodec-dev, libswscale-dev, libavformat-dev, libdevil-dev, lua5.1 Standards-Version: 3.9.5 Homepage: https://info-beamer.com/opensource diff -Nru --exclude '\.git' info-beamer-1.0~pre3/debian/copyright info-beamer-1.0~pre3+dfsg/debian/copyright --- info-beamer-1.0~pre3/debian/copyright 2015-01-16 12:30:02.000000000 +0000 +++ info-beamer-1.0~pre3+dfsg/debian/copyright 2016-06-28 23:49:02.000000000 +0100 @@ -1,6 +1,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: info-beamer Source: https://github.com/dividuum/info-beamer +Files-Excluded: + samples/hello/README.silkscreen.txt + samples/hello/silkscreen.ttf Files: * Copyright: 2013,2014 Florian Wesch <f...@dividuum.de> diff -Nru --exclude '\.git' info-beamer-1.0~pre3/debian/patches/glfw3.patch info-beamer-1.0~pre3+dfsg/debian/patches/glfw3.patch --- info-beamer-1.0~pre3/debian/patches/glfw3.patch 1970-01-01 01:00:00.000000000 +0100 +++ info-beamer-1.0~pre3+dfsg/debian/patches/glfw3.patch 2016-06-29 00:26:31.000000000 +0100 @@ -0,0 +1,143 @@ +Description: Port to GLFW 3 + Backported from upstream. Unnessesary X11 dependencies removed. +Origin: backport, https://github.com/dividuum/info-beamer/commit/721e66ad96145452b048e4c9a8395e858ebd2f7f +Bug: https://github.com/dividuum/info-beamer/issues/16 +Bug-Debian: https://bugs.debian.org/826288 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/font.c ++++ b/font.c +@@ -5,7 +5,6 @@ + #include <unistd.h> + + #include <GL/gl.h> +-#include <GL/glfw.h> + #include <FTGL/ftgl.h> + #include <lauxlib.h> + #include <lualib.h> +--- a/main.c ++++ b/main.c +@@ -23,7 +23,7 @@ + #include <GL/glew.h> + #include <GL/gl.h> + #include <GL/glext.h> +-#include <GL/glfw.h> ++#include <GLFW/glfw3.h> + #include <IL/il.h> + #include <IL/ilu.h> + #include <libavformat/avformat.h> +@@ -1155,23 +1155,25 @@ static void check_inotify() { + /*============ GUI ===========*/ + + static int win_w, win_h; ++static GLFWwindow *window; + +-static void GLFWCALL reshape(int width, int height) { ++static void reshape(GLFWwindow* window, int width, int height) { + win_w = width; + win_h = height; + fprintf(stderr, INFO("resized to %dx%d\n"), width, height); + } + +-static void GLFWCALL keypressed(int key, int action) { +- if (action == GLFW_PRESS) { +- switch (key) { +- case GLFW_KEY_SPACE: +- node_profiler(); +- break; +- case GLFW_KEY_ESC: +- running = 0; +- break; +- } ++static void keypressed(GLFWwindow* window, int key, int scancode, int action, int mods) { ++ if (action != GLFW_PRESS) ++ return; ++ ++ switch (key) { ++ case GLFW_KEY_SPACE: ++ node_profiler(); ++ break; ++ case GLFW_KEY_ESCAPE: ++ running = 0; ++ break; + } + } + +@@ -1435,11 +1437,12 @@ static void tick() { + glClear(GL_COLOR_BUFFER_BIT); + node_render_self(&root, win_w, win_h); + +- glfwSwapBuffers(); ++ glfwSwapBuffers(window); ++ glfwPollEvents(); + + node_tree_gc(&root); + +- if (!glfwGetWindowParam(GLFW_OPENED)) ++ if (glfwWindowShouldClose(window)) + running = 0; + } + +@@ -1512,10 +1515,10 @@ int main(int argc, char *argv[]) { + struct event tcp_event; + open_tcp(&tcp_event); + +- glfwInit(); +- glfwOpenWindowHint(GLFW_FSAA_SAMPLES, 4); ++ if (!glfwInit()) ++ die("cannot initialize glfw"); + +- int mode = getenv("INFOBEAMER_FULLSCREEN") ? GLFW_FULLSCREEN : GLFW_WINDOW; ++ int fullscreen = getenv("INFOBEAMER_FULLSCREEN") != NULL; + int width = 1024; + int height = 768; + +@@ -1529,22 +1532,30 @@ int main(int argc, char *argv[]) { + + fprintf(stderr, INFO("initial size is %dx%d\n"), width, height); + +- if(!glfwOpenWindow(width, height, 8,8,8,8, 0,0, mode)) ++ GLFWmonitor* monitor = glfwGetPrimaryMonitor(); ++ if (!fullscreen) ++ monitor = NULL; ++ ++ window = glfwCreateWindow(width, height, VERSION_STRING, monitor, NULL); ++ if (!window) + die("cannot open window"); + ++ glfwSetFramebufferSizeCallback(window, reshape); ++ glfwSetKeyCallback(window, keypressed); ++ ++ glfwMakeContextCurrent(window); ++ glfwSwapInterval(1); ++ ++ glfwGetFramebufferSize(window, &win_w, &win_h); ++ + GLenum err = glewInit(); + if (err != GLEW_OK) + die("cannot initialize glew"); + if (!glewIsSupported("GL_VERSION_3_0")) + die("need opengl 3.0 support\n"); + +- glfwSetWindowTitle(VERSION_STRING); +- glfwSwapInterval(1); +- glfwSetWindowSizeCallback(reshape); +- glfwSetKeyCallback(keypressed); +- +- if (mode == GLFW_FULLSCREEN) +- glfwDisable(GLFW_MOUSE_CURSOR); ++ if (fullscreen) ++ glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED); + + ilInit(); + iluInit(); +--- a/shader.c ++++ b/shader.c +@@ -6,7 +6,6 @@ + + #include <GL/glew.h> + #include <GL/gl.h> +-#include <GL/glfw.h> + #include <FTGL/ftgl.h> + #include <lauxlib.h> + #include <lualib.h> diff -Nru --exclude '\.git' info-beamer-1.0~pre3/debian/patches/no-git.patch info-beamer-1.0~pre3+dfsg/debian/patches/no-git.patch --- info-beamer-1.0~pre3/debian/patches/no-git.patch 1970-01-01 01:00:00.000000000 +0100 +++ info-beamer-1.0~pre3+dfsg/debian/patches/no-git.patch 2016-06-29 00:39:01.000000000 +0100 @@ -0,0 +1,18 @@ +Description: Disable use of git during build + Now that .git has been removed due to non-free files in the repository, git can + no longer be used to examine the upstream repository. This patch removes uses + of git so the package can build again. +Author: James Cowgill <jcowg...@debian.org> +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ + + RELEASE = 1.0pre3 + +-VERSION = $(RELEASE).$(shell git rev-parse --short=6 HEAD) ++VERSION = $(RELEASE) + + ifdef DEBUG + CFLAGS ?= -ggdb -DDEBUG diff -Nru --exclude '\.git' info-beamer-1.0~pre3/debian/patches/series info-beamer-1.0~pre3+dfsg/debian/patches/series --- info-beamer-1.0~pre3/debian/patches/series 2016-03-06 21:30:45.000000000 +0000 +++ info-beamer-1.0~pre3+dfsg/debian/patches/series 2016-06-29 00:37:26.000000000 +0100 @@ -1 +1,3 @@ ffmpeg_2.9.patch +glfw3.patch +no-git.patch diff -Nru --exclude '\.git' info-beamer-1.0~pre3/samples/hello/README.silkscreen.txt info-beamer-1.0~pre3+dfsg/samples/hello/README.silkscreen.txt --- info-beamer-1.0~pre3/samples/hello/README.silkscreen.txt 2015-01-06 15:00:48.000000000 +0000 +++ info-beamer-1.0~pre3+dfsg/samples/hello/README.silkscreen.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -Thank you for downloading Silkscreen, a type family for your Web graphics -by Jason Kottke (ja...@kottke.org). - -To install the Silkscreen type family, unzip this file and drag the files -into the Fonts folder in the Control Panel. - -If you encounter any problems in using this font, please email me and I'll -see if I can try and fix it. Please note that I can't help you with any -installation issues. Please consult your system's help files for assistance. - -This font is free for personal and corporate use and may be redistributed in -this unmodified form on your Web site. I would ask that you not modify and -then redistribute this font...although you may modify it for your own -personal use. If you really like this font and use it often, feel free to -mail me (e- or snail mail) some small token of your appreciation. A URL -of your work using Silkscreen would be appreciated as well. - -All future bug fixes, updates, and additions to the Silkscreen type family -will be available on my Web site at the following URL: - -http://www.kottke.org/plus/type/silkscreen/index.html - -Again, thanks for downloading Silkscreen. Enjoy! - --jason \ No newline at end of file Binary files /tmp/4mkguaoTw7/info-beamer-1.0~pre3/samples/hello/silkscreen.ttf and /tmp/_6WzYjwpzb/info-beamer-1.0~pre3+dfsg/samples/hello/silkscreen.ttf differ
signature.asc
Description: This is a digitally signed message part
