--- lynkeos.app-1.2.orig/debian/Lynkeos.desktop +++ lynkeos.app-1.2/debian/Lynkeos.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Lynkeos Image Processor +Name[bg]=Обработка на изображения (Lynkeos) +Comment=Filtering of astronomical images +Comment[bg]=Обработване на астрономически изображения +Type=Application +Version=1.0 +Categories=Graphics;Photography;Astronomy; +Icon=/usr/lib/GNUstep/Applications/Lynkeos.app/Resources/Lynkeos.png +Exec=Lynkeos --- lynkeos.app-1.2.orig/debian/README.source +++ lynkeos.app-1.2/debian/README.source @@ -0,0 +1,8 @@ +This package uses dpatch (in a fairly standard/straightforward way) to +manage all modifications to the upstrean source. Please see + + /usr/share/doc/dpatch/README.source.gz + +for further instructions. + + -- Yavor Doganov , Sun, 30 May 2010 16:49:33 +0300 --- lynkeos.app-1.2.orig/debian/changelog +++ lynkeos.app-1.2/debian/changelog @@ -0,0 +1,180 @@ +lynkeos.app (1.2-6.2build2) utopic; urgency=medium + + * Rebuild against libgnustep-gui0.24. + + -- Colin Watson Thu, 28 Aug 2014 11:17:21 -0700 + +lynkeos.app (1.2-6.2build1) utopic; urgency=medium + + * No-change rebuild against libav10. + + -- Logan Rosen Sat, 31 May 2014 15:48:20 -0400 + +lynkeos.app (1.2-6.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/libav_10.dpatch: Port to libav 10 API. Thanks to Anton + Khirnov for the patch (Closes: #739316) + * Build-depend on libtiff-dev (Closes: #722968) + + -- Moritz Muehlenhoff Tue, 11 Mar 2014 20:13:54 +0100 + +lynkeos.app (1.2-6.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/libav_9.dpatch: Port to libav 9 API. Thanks to Moritz + Muehlenhoff for the patch (Closes: #720820) + + -- Sebastian Ramacher Wed, 04 Sep 2013 14:12:18 +0200 + +lynkeos.app (1.2-6) unstable; urgency=low + + * debian/patches/compilation-errors.dpatch: New (Closes: #629206). + * debian/patches/libav_0.7.dpatch: New; port to libav/0.7, thanks Colin + Watson (Closes: #638535). + * debian/patches/00list: Update. + * debian/control (Build-Depends): Add libtiff4-dev. Require + libavcodec-dev/libavformat-dev/libswscale-dev >= 4:0.7.1. + (Vcs-Arch): Replace with... + (Vcs-Git, Vcs-Browser): ...as the package is now maintained in Git. + (Standards-Version): Bump to 3.9.2; no changes required. + + -- Yavor Doganov Mon, 26 Sep 2011 19:06:08 +0300 + +lynkeos.app (1.2-5) unstable; urgency=low + + * debian/compat: Set to 7. + * debian/control (Section): Change to `gnustep'. + (Build-Depends): Require debhelper >= 7, remove version constraint for + libgnustep-gui-dev. Drop libdts-dev. + (Depends): Add ${gnustep:Depends}. + (Standards-Version): Compliant with 3.8.4 as of this release. + * debian/rules: Include /usr/share/GNUstep/debian/config.mk, export + GNUSTEP_MAKEFILES and avoid gs_make. + (d_app): New variable. + (OPTFLAG, ADDITIONAL_CFLAGS): No longer define; rework noopt handling + to be compatible with gnustep-make/2.4.x (Closes: #581957). + (install): Replace dh_clean -k with dh_prep. + (binary-arch): Don't install the lintian override. Conditionally move + Resources to /usr/share. + * debian/preinst: + * debian/source/format: + * debian/README.source: New file. + * debian/lintian-override: Delete. + * debian/Lynkeos.desktop: Make it valid. + * debian/patches/05_ffmpeg_build_fix.dpatch: Add -ltiff to + ADDITIONAL_OBJC_LIBS; fixes FTBFS with GNU gold (Closes: #555578). + Remove -ldts; not needed. + + -- Yavor Doganov Sun, 30 May 2010 16:58:57 +0300 + +lynkeos.app (1.2-4) unstable; urgency=low + + * debian/compat: Set to 6. + * debian/control (Build-Depends): Bump debhelper to >= 6. Version the + dependency on libavcodec-dev to ensure that the package gets built + against libavcodec52 on all architectures. Add libswscale-dev. + (Vcs-Arch): New field. + * debian/patches/05_ffmpeg_build_fix.dpatch: Update for the current + ffmpeg: + + Don't set ADDITIONAL_INCLUDE_DIRS. + + Add -lswscale to ADDITIONAL_OBJC_LIBS. + + Include the correct headers (Closes: #518233). + + Replace the deprecated `img_convert' function with `sws_scale' + (Closes: #487641). + * debian/watch: New file, currently with commented pattern (Addresses: + #483430). + + -- Yavor Doganov Wed, 11 Mar 2009 15:14:08 +0200 + +lynkeos.app (1.2-3) unstable; urgency=low + + * debian/patches/05_ffmpeg_build_fix.dpatch: Remove lots of useless + libraries from ADDITIONAL_OBJC_LIBS. This fixes FTBFS (Closes: + #489845) and maybe will make the Ubuntu maintainer's life easier + (Closes: #455771). + * debian/control (Build-Depends): Wrap them and bump libgnustep-gui-dev + to >= 0.14. + (Standards-Version): Set to 3.8.0; no changes required. + * debian/rules: Use default and automatic variables where possible. + (ADDITIONAL_OBJCFLAGS): Rename as... + (OPTFLAG): ...as it is used only for the optimization flag. + + -- Yavor Doganov Wed, 09 Jul 2008 19:07:22 +0300 + +lynkeos.app (1.2-2) unstable; urgency=low + + * debian/control (Maintainer): Adopting package, set the GNUstep team as + maintainer (Closes: #448739). + (Uploaders): Add myself. + (Section): Changed to `science'. + (Build-Depends): Bump debhelper to (>= 5), libgnustep-gui-dev to (>= + 0.12). Replace fftw3-dev with libfftw3-dev. Add dpatch and + imagemagick. Drop gnustep-make. + (Standards-Version): Bump to 3.7.2 (no changes). + (Homepage): Moved to its own field. + * Acknowledge NMUs, many thanks to Julien Danjou and Hubert Chan + (Closes: #370268, #391260). + * debian/compat: Bump level to 5. + * debian/dirs: Deleted. + * debian/manpages: Likewise. + * debian/menu (section): Changed to `Applications/Science/Astronomy'. + (longtitle, icon): Added. + * debian/rules: Include include /usr/share/dpatch/dpatch.make. + (CFLAGS): Do not define. + (ADDITIONAL_OBJCFLAGS, ADDITIONAL_CFLAGS): New conditionally defined + variables. + (configure, configure-stamp): Delete these targets. + (build): Depend on the `patch' target. + (build-stamp): Remove `configure-stamp' from prerequisites. Use + gs_make and do not source GNUstep.sh (Closes: #451445). Honor + DEB_BUILD_OPTIONS. Generate the PNG icon and convert it to XPM. + (clean): Renamed to `clean-patched'; depend on it and `unpatch'. + (clean-patched): Do not delete `configure-stamp' as it is not + created. Do not ignore errors. Delete the XPM icon and the manpage + symlink as well. + (install): Use gs_make, the standard DESTDIR variable and + GNUSTEP_INSTALLATION_DOMAIN. Remove the invalid .desktop file and + install ours. Do not invoke dh_installdirs. Remove the executable + bits of ImageListWindow.gorm. + (binary-arch): Do not create the app wrapper. Remove needless + dh_installexamples invocation. Use gsdh_gnustep. Create a symlink + for the manpage (fixes lintian warning). + (.PHONY): Drop configure. + * debian/Lynkeos.desktop: Added. + * Split the patches from diff.gz in debian/patches and maintain them + with dpatch: + + 05_ffmpeg_build.dpatch. + + 10_plist_icon.dpatch. + + 15_manpage.dpatch: New. + * debian/patched/00list: Create. + + -- Yavor Doganov Sat, 17 Nov 2007 16:29:00 +0200 + +lynkeos.app (1.2-1.2) unstable; urgency=low + + * Non-maintainer upload + * Rebuild against new GNUstep libraries. + - Update Build-dep to libgnustep-gui-dev. + - Fix problem with NSMovie aliasing. + * Add license header to debian/copyright file. + + -- Hubert Chan Thu, 5 Oct 2006 11:07:58 -0400 + +lynkeos.app (1.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS + - Build-dep on libgnustep-gui0.10-dev instead of libgnustep-gui0.9-dev + (Closes: #350429) + - Fix problem with libavcodec-dev (Closes: #327429) + - Add an include path to Sources/GNUmakefile + + -- Julien Danjou Thu, 1 Jun 2006 11:46:49 +0200 + +lynkeos.app (1.2-1) unstable; urgency=low + + * Initial Release. (closes: #300000) + + -- Gürkan Sengün Sun, 17 Apr 2005 21:35:42 +0200 + --- lynkeos.app-1.2.orig/debian/compat +++ lynkeos.app-1.2/debian/compat @@ -0,0 +1 @@ +7 --- lynkeos.app-1.2.orig/debian/control +++ lynkeos.app-1.2/debian/control @@ -0,0 +1,29 @@ +Source: lynkeos.app +Section: gnustep +Priority: optional +Maintainer: Debian GNUstep maintainers +Uploaders: Yavor Doganov +Build-Depends: debhelper (>= 7), + dpatch, + libavcodec-dev (>= 4:0.7.1), + libavformat-dev (>= 4:0.7.1), + libswscale-dev (>= 4:0.7.1), + libfftw3-dev, + libtiff-dev, + libgnustep-gui-dev, + openssl, + imagemagick +Vcs-Git: git://git.debian.org/pkg-gnustep/lynkeos.app.git +Vcs-Browser: http://git.debian.org/?p=pkg-gnustep/lynkeos.app.git +Standards-Version: 3.9.2 +Homepage: http://christophe.jalady.free.Fr/lynkeos/ + +Package: lynkeos.app +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${gnustep:Depends} +Description: Tool to process planetary astronomical images for GNUstep + This is an application dedicated to the processing of astronomical + (mainly planetary) images taken with a webcam through a telescope. + It was created on Mac OS X. --- lynkeos.app-1.2.orig/debian/copyright +++ lynkeos.app-1.2/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Gürkan Sengün on +Sun, 17 Apr 2005 21:35:42 +0200. + +It was downloaded from http://christophe.jalady.free.fr/lynkeos/ + http://lynkeos.sourceforge.net/ + +Upstream Authors: Christophe Jalady + Jean-Etienne Lamiaud + +Copyright 2003 - 2004 Jean-Etienne Lamiaud , + 2005 Christophe Jalady + +License: +Released under the GNU GPL. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU GPL is available at +/usr/share/common-licenses/GPL. --- lynkeos.app-1.2.orig/debian/menu +++ lynkeos.app-1.2/debian/menu @@ -0,0 +1,5 @@ +?package(lynkeos.app):needs="X11" \ + section="Applications/Science/Astronomy" \ + title="Lynkeos" command="/usr/bin/Lynkeos" \ + icon="/usr/share/pixmaps/Lynkeos.xpm" \ + longtitle="Tool for manipulation of planetary images" --- lynkeos.app-1.2.orig/debian/patches/00list +++ lynkeos.app-1.2/debian/patches/00list @@ -0,0 +1,7 @@ +compilation-errors +05_ffmpeg_build_fix +10_plist_icon +15_manpage +libav_0.7 +libav_9 +libav_10 \ No newline at end of file --- lynkeos.app-1.2.orig/debian/patches/05_ffmpeg_build_fix.dpatch +++ lynkeos.app-1.2/debian/patches/05_ffmpeg_build_fix.dpatch @@ -0,0 +1,142 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_ffmpeg_build_fix.dpatch by Yavor Doganov +## +## DP: Build fix. + +@DPATCH@ +diff -urNad lynkeos.app-1.2~/Sources/GNUmakefile lynkeos.app-1.2/Sources/GNUmakefile +--- lynkeos.app-1.2~/Sources/GNUmakefile 2009-03-11 15:16:32.000000000 +0200 ++++ lynkeos.app-1.2/Sources/GNUmakefile 2009-03-11 15:16:34.000000000 +0200 +@@ -1,14 +1,7 @@ + include $(GNUSTEP_MAKEFILES)/common.make + +-# Change this to your special installation of FFmeg library +-ADDITIONAL_INCLUDE_DIRS += -I/home/thecat/Devel/ffmpeg-0.4.8/libavcodec/ \ +- -I/home/thecat/Devel/ffmpeg-0.4.8/libavformat/ +- +- + APP_NAME = Lynkeos + +-Lynkeos_RESOURCE_DIRS = ../GNUstep +- + Lynkeos_OBJC_FILES = main.m \ + MyImageListEnumerator.m \ + MyCustomViews.m \ +@@ -35,9 +28,14 @@ + Lynkeos_MAIN_MODEL_FILE=MainMenu.gorm + Lynkeos_RESOURCE_FILES= ../GNUstep/MainMenu.gorm \ + ../GNUstep/ImageListWindow.gorm \ ++ LynkeosInfo.plist \ ++ Lynkeos.png + +-ADDITIONAL_OBJC_LIBS += -lavformat -lavcodec -lfftw3f_threads -lfftw3_threads -lfftw3f -lfftw3 -lm +-ADDITIONAL_LIB_DIRS += -L/home/thecat/Devel/ffmpeg-0.4.8/libavformat/ -L/home/thecat/Devel/ffmpeg-0.4.8/libavcodec ++Lynkeos_APPLICATION_ICON=Lynkeos.png ++ ++ADDITIONAL_OBJC_LIBS += -lavformat -lavcodec -lswscale -lavutil -ltiff \ ++ -lfftw3f_threads -lfftw3_threads -lfftw3f -lfftw3 \ ++ -lm + + ADDITIONAL_CPPFLAGS += -DFLOAT_PIXELS + +@@ -45,4 +43,3 @@ + #include $(GNUSTEP_MAKEFILES)/ctool.make + #include $(GNUSTEP_MAKEFILES)/objc.make + #include $(GNUSTEP_MAKEFILES)/bundle.make +- +diff -urNad lynkeos.app-1.2~/Sources/LynkeosFfmpegMovie.h lynkeos.app-1.2/Sources/LynkeosFfmpegMovie.h +--- lynkeos.app-1.2~/Sources/LynkeosFfmpegMovie.h 2009-03-11 15:16:32.000000000 +0200 ++++ lynkeos.app-1.2/Sources/LynkeosFfmpegMovie.h 2009-03-11 15:16:34.000000000 +0200 +@@ -1,5 +1,7 @@ ++#undef NSMovie // get rid of NSMovie alias while we include AppKit + #import + #import ++#define NSMovie LynkeosFfmpegMovie + + #include "LynkeosCommon.h" + #include "ffmpeg_access.h" +diff -urNad lynkeos.app-1.2~/Sources/ffmpeg_access.c lynkeos.app-1.2/Sources/ffmpeg_access.c +--- lynkeos.app-1.2~/Sources/ffmpeg_access.c 2009-03-11 15:16:32.000000000 +0200 ++++ lynkeos.app-1.2/Sources/ffmpeg_access.c 2009-03-11 15:18:35.000000000 +0200 +@@ -18,8 +18,9 @@ + // format. + + #include "ffmpeg_access.h" +-#include "avcodec.h" +-#include "avformat.h" ++#include ++#include ++#include + + #include + +@@ -34,6 +35,7 @@ + + static int _ffmpegErrorOccuredFlag; + static char* _ffmpegLastErrorString; ++static struct SwsContext *img_convert_ctx; + + + int ffmpegNextFrame(FfmpegMovie* movie){ +@@ -50,8 +52,23 @@ + return GetNextFrame(pFormatCtx, pCodecCtx,videoStream,pFrame); + } + +-int ffmpegConvertCurrentFrame(FfmpegMovie* movie){ +- img_convert((AVPicture *)movie->pConvertedFrame, PIX_FMT_RGB24, (AVPicture*)movie->pCurrentFrame,movie->pCodecCtx->pix_fmt,movie->pCodecCtx->width,movie->pCodecCtx->height); ++int ffmpegConvertCurrentFrame (FfmpegMovie* movie) ++{ ++ img_convert_ctx = sws_getContext (movie->pCodecCtx->width, ++ movie->pCodecCtx->height, PIX_FMT_RGB24, ++ movie->pCodecCtx->width, ++ movie->pCodecCtx->height, ++ movie->pCodecCtx->pix_fmt, SWS_BICUBIC, ++ NULL, NULL, NULL); ++ if (img_convert_ctx == NULL) ++ { ++ fprintf (stderr, "Cannot create conversion context.\n"); ++ return 0; ++ } ++ sws_scale (img_convert_ctx, movie->pCurrentFrame->data, ++ movie->pCurrentFrame->linesize, 0, movie->pCodecCtx->height, ++ movie->pConvertedFrame->data, movie->pConvertedFrame->linesize); ++ return 0; + } + + int GetNextFrame(AVFormatContext *pFormatCtx, AVCodecContext *pCodecCtx, +@@ -240,7 +257,7 @@ + // Find the first video stream + videoStream=-1; + for(i=0; inb_streams; i++) +- if(pFormatCtx->streams[i]->codec.codec_type==CODEC_TYPE_VIDEO) ++ if(pFormatCtx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) + { + videoStream=i; + break; +@@ -284,12 +301,6 @@ + return _ffmpegErrorOccuredFlag; + } + +- // Hack to correct wrong frame rates that seem to be generated by some +- // codecs +- if(pCodecCtx->frame_rate>1000 && pCodecCtx->frame_rate_base==1){ +- pCodecCtx->frame_rate_base=1000; +- } +- + // Allocate video frame + pFrame=avcodec_alloc_frame(); + +diff -urNad lynkeos.app-1.2~/Sources/ffmpeg_access.h lynkeos.app-1.2/Sources/ffmpeg_access.h +--- lynkeos.app-1.2~/Sources/ffmpeg_access.h 2009-03-11 15:16:32.000000000 +0200 ++++ lynkeos.app-1.2/Sources/ffmpeg_access.h 2009-03-11 15:16:34.000000000 +0200 +@@ -1,8 +1,8 @@ + #ifndef FFMPEG_ACCES_H + #define FFMPEG_ACCES_H + +-#include "avcodec.h" +-#include "avformat.h" ++#include ++#include + + typedef struct FfmpegMovie{ + AVFormatContext *pFormatCtx; --- lynkeos.app-1.2.orig/debian/patches/10_plist_icon.dpatch +++ lynkeos.app-1.2/debian/patches/10_plist_icon.dpatch @@ -0,0 +1,65 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_plist_icon.dpatch by Yavor Doganov +## +## DP: Fix of the plist plus icon. + +@DPATCH@ +diff -urNad lynkeos.app-1.2~/Sources/Lynkeos.png.in lynkeos.app-1.2/Sources/Lynkeos.png.in +--- lynkeos.app-1.2~/Sources/Lynkeos.png.in 1970-01-01 02:00:00.000000000 +0200 ++++ lynkeos.app-1.2/Sources/Lynkeos.png.in 2007-11-17 16:15:31.000000000 +0200 +@@ -0,0 +1,38 @@ ++iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAADAFBMVEX///84GRp8 ++UFKtjY9xXF2ijY7VrrGVcnbHwMFGKC2IX2aegIUVAgauhIxGNzqjhYzGoqotERh7 ++XGSIanK4naR8VmFzVF1QTU6mi5VyTl2Oe4MpBxY7ISxoSlk0MDJRMUYZDxYmFyJa ++QlQ9KjqSjJIvHTB1ZXiJgY1YTl5IP056eHwDAgdjYG6Af4QHCCkXGDsmJ0A2N0RZ ++WmZITGJxdIZFTnMkLU4wOlxLVnhTXHpiaX9IS1Q8THNZY3tmaG05SGpOVmgyQ2VD ++VHE5QlA+T2JscnlKVlivsLB5hn9iY11vbmpIR0SIckaEakKLaTtQMAheQh+FXzGE ++a0twSyB4VCxJKAiEY0Gie1SMa0u8lGquiWOATB2mbDiaaz+ic0eWbkqYck50W0R6 ++YkuqlYGUYDaMZEJ8WDttUjyEZUy0jW12PxVcNReCXUGsfFezg17GlW+QcluFala5 ++lHiMiIVgLwxpOhiRVi2ETypOLxpqRCmVZUWie1+YdFqsi3Oji3p0ZFmZkIp4SSzI ++jWeic1WVak6se12MZEy0g2W9jGyNa1ZpVUmah3uGVjurdFWca09nSDfHlXmrgWmZ ++eWejhHJqPSaRWTybY0WVXkJaOip1TDezd1eUZEy0e128gmXOknOic1zQmHu0hGu9 ++jXSCa19dU06moJ1YJAtZLRiETzajaU+bZk1MNSq9hGrSoYq0i3eri3xwXFNJJxml ++bVXDgma8fWSrdFy1e2OIXUvEhm3HjHOabFmPZVR6WEqneWazhnSshHOCZFfesZ68 ++loa1fWk8KiNbQzrGmoq0jX60cVuXZlaKbWN1aWW0dWPAhHK/j4GrhnxAEwdJHBF8 ++UEW8fW2hcGN7XVXPpZujhX19cG28uLete3Csi4SNcmztxLtmWFWQgn+blpWyrays ++p6aCVk6lfHVcS0hzTUeFXFaMZV+0hX7it7Guk4+6mZVXMCxyVFGaeXZ+ZGJbOzm0 ++i4jFnJmHeXhoSUiVamithYQsBQW7kZCEZ2eWh4ell5e5sbHY0dFYWFjgBaQxAAAA ++AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAH ++dElNRQfVBBYJATA+xrPdAAADiUlEQVR4nGNgGAWjYNAAjod/inVv3PDyuvHlfsOj ++mxx4Fd9cWnya5ejqjRUbQ0ND/UMrNn7sqv+y9CEO1Y9uPJ0REFweEhiU1H+EUYbx ++yNHE9PSQkKzSKf2n/9xEV/3wxtEZjbFti4VEX3BJKzJe2Bi68eJFGVWWb7sfP0vM ++CQ7or1+Kon7pkhkp8QVCYqLfjp37yFk6pXTKlGwgXv70/vG9L55/zcgJnPLsN8KW ++pU9nAFVLfjt36BCrkerRysbGxvKp5St6GmcelVe739C9/8oepkTfmf0NUPXFRzPq ++xGSPXfv5285MW6Y/zG961cq+lKlTq9pSwxo/8pjZuHZf33fl6uKMgBt/Qertnu4S ++lmE/+JNXWN+QQTEnrbNma27rttzc8DlbN7VEbJ/JwKDvovX72MuvQomVe0AaxOvf ++K3589ZmXWw/I8Z6ZtmvXrGlzZs1ds2XWnNzmXY/TgKJ6lq4S1052Xe0HucpTq57L ++++5n7u88QBmjezN3VW+aOwcIQWDb1r6WtG6QDmepNwfXyHf132Fg+L+EhYeD7cnP ++jSANzl0526/snTt3x44dm3dc3rJp65XC7Z1A8f/a919/fsXz5Wk2A4OOtxAPh8in ++yT+OACUMu9Jmn2zNm7tm584d27bMOVw9Oz7nOShctPl/fr6rzf0xgIHBVVyc59Hn ++2xOXMYJsWBJWsDX38pkzW7Zs3rFlzpmt7TV76oHintK8vGx3tYVlVYEcB29OtQfM +++1OWAd1n57ans31hR1P+vKZ5O+bt7Jg4PzXpBgPD3yNPbv98paTEchoUSrbW3srq ++ryfuLV/2COSJxTXVmZn58xYs2Dlh0eEzBYVJDAz/Pl5Zt/6aMI9wvTU44qy8VxuY ++PDg/MaUk/b5y1+KC/Qs7Mhd1TFjTsTBzUuE7paVfZlQff3nNhJHL0/k/JKqtrMWV ++jX5314WnZF3g/Pjuw51JdS9f7js/+c6vd0c//lgRt+jYzwfGbxf/N0ckPlsXb0Nj ++V/Xk9bNWzn4889mld+/ebXj+/Nnjx7vnRx77rGKnqfTYyNEFOblauVhreru56v4+ ++vn9i9ab5fStXXpnf17rtbFERs66dhtIGTxdzBnRg6WRsraTpYKRj8uX3/d+/73d3 ++39cy0dF4qrTkv7OjPfZMZ+Fk7+JmbOz238jIDog1xN0cXMzNHbErhgEnC3sIcAQC ++e0dT/KpHwSigHwAAh32VJ3Wa29gAAAAASUVORK5CYII= +diff -urNad lynkeos.app-1.2~/Sources/LynkeosInfo.plist lynkeos.app-1.2/Sources/LynkeosInfo.plist +--- lynkeos.app-1.2~/Sources/LynkeosInfo.plist 2005-03-24 21:40:04.000000000 +0200 ++++ lynkeos.app-1.2/Sources/LynkeosInfo.plist 2007-11-17 16:15:31.000000000 +0200 +@@ -1,7 +1,11 @@ + { + ApplicationName = "Lynkeos"; +- ApplicationDescription = "image filtering"; +- ApplicationRelease = "1.0"; ++ ApplicationDescription = "Image filtering"; ++ ApplicationRelease = "1.2"; ++ Authors = ("Jean-Etienne Lamiaud "); ++ Copyright = "Copyright 2003 - 2004 Jean-Etienne Lamiaud"; ++ CopyrightDescription = "GNU General Public License"; ++ URL = "http://christophe.jalady.free.fr/lynkeos/"; + + NSTypes = ( + { --- lynkeos.app-1.2.orig/debian/patches/15_manpage.dpatch +++ lynkeos.app-1.2/debian/patches/15_manpage.dpatch @@ -0,0 +1,44 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_manpage.dpatch by Yavor Doganov +## +## DP: Terminology and typo fixes.. + +@DPATCH@ +diff -urNad lynkeos.app-1.2~/GNUstep/lynkeos.1 lynkeos.app-1.2/GNUstep/lynkeos.1 +--- lynkeos.app-1.2~/GNUstep/lynkeos.1 2005-04-17 19:45:37.000000000 +0300 ++++ lynkeos.app-1.2/GNUstep/lynkeos.1 2007-11-17 19:27:28.000000000 +0200 +@@ -2,7 +2,7 @@ + .\"" + .TH Lynkeos 1x 2005-04-17 "Lynkeos" + .SH NAME +-Lynkeos is an application dedicated to the processing of astronomical (mainly planetary) images taken with a webcam through a telescope. ++Lynkeos \- application dedicated to the processing of astronomical (mainly planetary) images taken with a webcam through a telescope. + .SH SYNOPSIS + .B lynkeos.app + .I "" +@@ -10,7 +10,7 @@ + This manual page describe succintly the aims of the Lynkeos application. + + .br +-How does it works ? ++How does it work? + .br + By stacking the best images, the signal to noise ratio is increased and details lost in the noise of individual images become visible in the resulting image. + +@@ -35,12 +35,12 @@ + .br + You find help and tutorials. + .br +-\fBLynkeos-Linux specific web site\fP. ++\fBLynkeos-GNU/Linux specific web site\fP. + .br + http://christophe.jalady.free.fr/lynkeos/ + .br +-You find some specific information on the port on Linux of Lynkeos. ++You find some specific information on the port on GNU/Linux of Lynkeos. + .SH AUTHORS + Lynkeos is writting by LAMIAUD Jean-Etienne . + .br +-The Linux port is made by JALADY Christophe . +\ No newline at end of file ++The GNU/Linux port is made by JALADY Christophe . --- lynkeos.app-1.2.orig/debian/patches/compilation-errors.dpatch +++ lynkeos.app-1.2/debian/patches/compilation-errors.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## compilation-errors.dpatch by Yavor Doganov +## +## DP: Build fix. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lynkeos.app~/Sources/LynkeosCommon.h lynkeos.app/Sources/LynkeosCommon.h +--- lynkeos.app~/Sources/LynkeosCommon.h 2011-06-05 18:14:47.000000000 +0300 ++++ lynkeos.app/Sources/LynkeosCommon.h 2011-06-05 18:37:13.000000000 +0300 +@@ -30,7 +30,6 @@ + + + #ifdef GNUSTEP +-typedef BOOL bool; + typedef long TimeValue; + + #define true 1 --- lynkeos.app-1.2.orig/debian/patches/libav_0.7.dpatch +++ lynkeos.app-1.2/debian/patches/libav_0.7.dpatch @@ -0,0 +1,110 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## libav_0.7.dpatch by Colin Watson +## +## DP: Port to libav 0.7 API. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lynkeos.app-1.2~/Sources/ffmpeg_access.c lynkeos.app-1.2/Sources/ffmpeg_access.c +--- lynkeos.app-1.2~/Sources/ffmpeg_access.c 2011-08-19 17:24:35.000000000 +0100 ++++ lynkeos.app-1.2/Sources/ffmpeg_access.c 2011-08-19 17:24:47.000000000 +0100 +@@ -38,6 +38,9 @@ + static struct SwsContext *img_convert_ctx; + + ++int GetNextFrame(AVFormatContext *pFormatCtx, AVCodecContext *pCodecCtx, ++ int videoStream, AVFrame *pFrame); ++ + int ffmpegNextFrame(FfmpegMovie* movie){ + AVFormatContext *pFormatCtx; + AVCodecContext *pCodecCtx; +@@ -65,7 +68,7 @@ + fprintf (stderr, "Cannot create conversion context.\n"); + return 0; + } +- sws_scale (img_convert_ctx, movie->pCurrentFrame->data, ++ sws_scale (img_convert_ctx, (const uint8_t * const *) movie->pCurrentFrame->data, + movie->pCurrentFrame->linesize, 0, movie->pCodecCtx->height, + movie->pConvertedFrame->data, movie->pConvertedFrame->linesize); + return 0; +@@ -75,8 +78,6 @@ + int videoStream, AVFrame *pFrame) + { + static AVPacket packet; +- static int bytesRemaining=0; +- static uint8_t *rawData; + static bool fFirstTime=true; + int bytesDecoded; + int frameFinished; +@@ -89,19 +90,20 @@ + { + fFirstTime=false; + packet.data=NULL; ++ packet.size=0; + } + + // Decode packets until we have decoded a complete frame + while(true) + { + // Work on the current packet until we have decoded all of it +- while(bytesRemaining > 0) ++ while(packet.size > 0) + { + // Decode the next chunk of data +- bytesDecoded=avcodec_decode_video(pCodecCtx, pFrame, +- &frameFinished, rawData, bytesRemaining); ++ bytesDecoded=avcodec_decode_video2(pCodecCtx, pFrame, ++ &frameFinished, &packet); + +- //printf("Bytes Remaining: %d Bytes Decoded: %d \n",bytesRemaining,bytesDecoded); ++ //printf("Bytes Remaining: %d Bytes Decoded: %d \n",packet.size,bytesDecoded); + + // Was there an error? + if(bytesDecoded < 0) +@@ -110,8 +112,8 @@ + return false; + } + +- bytesRemaining = bytesRemaining - bytesDecoded; +- rawData+=bytesDecoded; ++ packet.size = packet.size - bytesDecoded; ++ packet.data+=bytesDecoded; + + // Did we finish the current frame? Then we can return + if(frameFinished) +@@ -130,16 +132,13 @@ + if(av_read_packet(pFormatCtx, &packet)<0) + goto loop_exit; + } while(packet.stream_index!=videoStream); +- +- bytesRemaining=packet.size; +- rawData=packet.data; + } + + loop_exit: + + // Decode the rest of the last frame +- bytesDecoded=avcodec_decode_video(pCodecCtx, pFrame, &frameFinished, +- rawData, bytesRemaining); ++ bytesDecoded=avcodec_decode_video2(pCodecCtx, pFrame, &frameFinished, ++ &packet); + + // Free last packet + if(packet.data!=NULL) +@@ -228,7 +227,7 @@ + int ret; + + // Open video file +- ret = av_open_input_file(&pFormatCtx, movieName, NULL, 0, NULL); ++ ret = avformat_open_input(&pFormatCtx, movieName, NULL, NULL); + if(ret != 0){ + printf("ERROR: Could not open file "); + printf(movieName); +@@ -257,7 +256,7 @@ + // Find the first video stream + videoStream=-1; + for(i=0; inb_streams; i++) +- if(pFormatCtx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) ++ if(pFormatCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO) + { + videoStream=i; + break; --- lynkeos.app-1.2.orig/debian/patches/libav_10.dpatch +++ lynkeos.app-1.2/debian/patches/libav_10.dpatch @@ -0,0 +1,64 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## libav_10.dpatch by anton@khirnov.net +## +## DP: Port to libav 10 API. + +@DPATCH@ +Index: lynkeos.app-1.2/Sources/ffmpeg_access.c +=================================================================== +--- lynkeos.app-1.2.orig/Sources/ffmpeg_access.c 2014-03-01 01:07:40.000000000 +0000 ++++ lynkeos.app-1.2/Sources/ffmpeg_access.c 2014-03-01 01:09:20.083727865 +0000 +@@ -129,7 +129,7 @@ + av_free_packet(&packet); + + // Read new packet +- if(av_read_packet(pFormatCtx, &packet)<0) ++ if(av_read_frame(pFormatCtx, &packet)<0) + goto loop_exit; + } while(packet.stream_index!=videoStream); + } +@@ -198,7 +198,7 @@ + + ffmpegLoadMovie((movie->pFormatCtx->filename),&newMovie); + +- av_close_input_file(movie->pFormatCtx); ++ avformat_close_input(&movie->pFormatCtx); + avcodec_close(movie->pCodecCtx); + av_free(((AVPicture *)(movie->pConvertedFrame))->data[0]); + av_free(movie->pCurrentFrame); +@@ -243,7 +243,7 @@ + if(avformat_find_stream_info(pFormatCtx, NULL)<0){ + printf("ERROR: Could not retrieve stream operation"); + printf("\n"); +- av_close_input_file(pFormatCtx); ++ avformat_close_input(&pFormatCtx); + //return -1; // Couldn't find stream information + ffmpegSetLastErrorOccured("Couldn't find stream information.",-1); + return _ffmpegErrorOccuredFlag; +@@ -264,7 +264,7 @@ + if(videoStream==-1){ + printf("ERROR: I didn't find a video stream"); + printf("\n"); +- av_close_input_file(pFormatCtx); ++ avformat_close_input(&pFormatCtx); + ffmpegSetLastErrorOccured("Didn't find a video stream.",-1); + //return -1; // Didn't find a video stream + return _ffmpegErrorOccuredFlag; +@@ -278,7 +278,7 @@ + if(pCodec==NULL){ + printf("ERROR: Codec not found"); + printf("\n"); +- av_close_input_file(pFormatCtx); ++ avformat_close_input(&pFormatCtx); + //return -1; // Codec not found + ffmpegSetLastErrorOccured("Codec not found.",-1); + return _ffmpegErrorOccuredFlag; +@@ -294,7 +294,7 @@ + if(avcodec_open2(pCodecCtx, pCodec, NULL)<0){ + printf("ERROR: Can't open the codec"); + printf("\n"); +- av_close_input_file(pFormatCtx); ++ avformat_close_input(&pFormatCtx); + //return -1; // Could not open codec + ffmpegSetLastErrorOccured("Could not open codec.",-1); + return _ffmpegErrorOccuredFlag; --- lynkeos.app-1.2.orig/debian/patches/libav_9.dpatch +++ lynkeos.app-1.2/debian/patches/libav_9.dpatch @@ -0,0 +1,27 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## libav_9.dpatch by Moritz Muehlenhoff +## +## DP: Port to libav 9 API. + +@DPATCH@ +diff -aur lynkeos.app-1.2.orig/Sources/ffmpeg_access.c lynkeos.app-1.2/Sources/ffmpeg_access.c +--- lynkeos.app-1.2.orig/Sources/ffmpeg_access.c 2005-04-17 17:40:27.000000000 +0200 ++++ lynkeos.app-1.2/Sources/ffmpeg_access.c 2013-07-24 20:24:23.472025000 +0200 +@@ -224,7 +224,7 @@ + + + // Retrieve stream information +- if(av_find_stream_info(pFormatCtx)<0){ ++ if(avformat_find_stream_info(pFormatCtx, NULL)<0){ + printf("ERROR: Could not retrieve stream operation"); + printf("\n"); + av_close_input_file(pFormatCtx); +@@ -275,7 +275,7 @@ + } + + // Open codec +- if(avcodec_open(pCodecCtx, pCodec)<0){ ++ if(avcodec_open2(pCodecCtx, pCodec, NULL)<0){ + printf("ERROR: Can't open the codec"); + printf("\n"); + av_close_input_file(pFormatCtx); --- lynkeos.app-1.2.orig/debian/preinst +++ lynkeos.app-1.2/debian/preinst @@ -0,0 +1,28 @@ +#!/bin/sh +# dpkg will not replace a real directory with a symlink. +# FIXME: Remove during the squeeze+1 cycle. + +set -e +set -u + +RESDIR=/usr/lib/GNUstep/Applications/Lynkeos.app/Resources + +case "$1" in + install | upgrade) + if [ -d $RESDIR ] && [ ! -L $RESDIR ]; then + rm -rf $RESDIR + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- lynkeos.app-1.2.orig/debian/rules +++ lynkeos.app-1.2/debian/rules @@ -0,0 +1,79 @@ +#!/usr/bin/make -f +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make +include /usr/share/GNUstep/debian/config.mk + +export GNUSTEP_MAKEFILES := $(GS_MAKE_DIR) +d_app := $(CURDIR)/debian/lynkeos.app + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +optim := debug=yes +endif + +build: patch build-stamp + +build-stamp: + dh_testdir + $(MAKE) -C Sources $(optim) messages=yes + cd Sources && openssl base64 -d -in Lynkeos.png.in > Lynkeos.png + convert Sources/Lynkeos.png -resize 32x32 Sources/Lynkeos.xpm + touch $@ + +clean: clean-patched unpatch + +clean-patched: + dh_testdir + dh_testroot + $(MAKE) -C Sources distclean + dh_clean build-stamp Sources/Lynkeos.png Sources/Lynkeos.xpm Lynkeos.1 + +install: build + dh_testdir + dh_testroot + dh_prep + $(MAKE) -C Sources install DESTDIR=$(d_app) \ + GNUSTEP_INSTALLATION_DOMAIN=SYSTEM +# Remove invalid .desktop file and install ours. + rm $(d_app)/usr/lib/GNUstep/Applications/*.app/Resources/*.desktop + install -D -m 644 debian/Lynkeos.desktop \ + $(d_app)/usr/share/applications/Lynkeos.desktop +# Install the XPM icon. + install -D -m 644 Sources/Lynkeos.xpm \ + $(d_app)/usr/share/pixmaps/Lynkeos.xpm +# Remove the executable bit. + chmod -x $(d_app)/usr/lib/GNUstep/Applications/Lynkeos.app/Resources/ImageListWindow.gorm/* + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installmenu + ln -s GNUstep/lynkeos.1 Lynkeos.1 + dh_installman Lynkeos.1 +ifeq ($(GS_USE_FHS),yes) + gsdh_gnustep + dh_installdirs usr/share/GNUstep + mv $(d_app)$(GNUSTEP_SYSTEM_APPS)/Lynkeos.app/Resources \ + $(d_app)/usr/share/GNUstep/Lynkeos.app + dh_link usr/share/GNUstep/Lynkeos.app \ + $(GNUSTEP_SYSTEM_APPS)/Lynkeos.app/Resources +endif + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- lynkeos.app-1.2.orig/debian/source/format +++ lynkeos.app-1.2/debian/source/format @@ -0,0 +1 @@ +1.0 --- lynkeos.app-1.2.orig/debian/watch +++ lynkeos.app-1.2/debian/watch @@ -0,0 +1,4 @@ +# Uncomment when the new GNUstep port for 2.x is released and is fully +# functional. +#version=3 +#http://sf.net/lynkeos/Lynkeos-Sources-([\d]+)-([\d]+)\.tar\.bz2