diff -Nru simage-1.7.1~2c958a6.dfsg/debian/changelog simage-1.7.1~2c958a6.dfsg/debian/changelog --- simage-1.7.1~2c958a6.dfsg/debian/changelog 2016-04-23 00:23:26.000000000 +0000 +++ simage-1.7.1~2c958a6.dfsg/debian/changelog 2016-09-06 17:59:40.000000000 +0000 @@ -1,8 +1,16 @@ -simage (1.7.1~2c958a6.dfsg-2.1build1) yakkety; urgency=medium +simage (1.7.1~2c958a6.dfsg-4) unstable; urgency=medium - * No-change rebuild for libpng soname change. + * [d223a78] Replace stderr by stdout in example. - -- Matthias Klose Sat, 23 Apr 2016 00:23:26 +0000 + -- Anton Gladky Tue, 06 Sep 2016 19:59:40 +0200 + +simage (1.7.1~2c958a6.dfsg-3) unstable; urgency=medium + + * [cd13cae] Apply cme fix dpkg. + * [7aee1b8] Add autopkgtest. + * [2132d39] Add include-binaries for the test image. + + -- Anton Gladky Sun, 04 Sep 2016 19:23:07 +0200 simage (1.7.1~2c958a6.dfsg-2.1) unstable; urgency=medium diff -Nru simage-1.7.1~2c958a6.dfsg/debian/control simage-1.7.1~2c958a6.dfsg/debian/control --- simage-1.7.1~2c958a6.dfsg/debian/control 2013-10-26 20:09:16.000000000 +0000 +++ simage-1.7.1~2c958a6.dfsg/debian/control 2016-09-04 17:19:10.000000000 +0000 @@ -1,40 +1,38 @@ Source: simage Maintainer: Debian Science Team -Uploaders: - Steve M. Robbins , - Anton Gladky -Vcs-Git: git://anonscm.debian.org/debian-science/packages/simage.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/simage.git -Homepage: https://bitbucket.org/Coin3D/simage +Uploaders: Steve M. Robbins , + Anton Gladky Section: graphics +Testsuite: autopkgtest Priority: optional -Build-Depends: - autotools-dev, - debhelper (>= 9), - libgif-dev, - libjpeg-dev, - libpng-dev, - libsndfile1-dev, - libtiff-dev, - libvorbis-dev, - zlib1g-dev -Standards-Version: 3.9.4 +Build-Depends: autotools-dev, + debhelper (>= 9), + libgif-dev, + libjpeg-dev, + libpng-dev, + libsndfile1-dev, + libtiff-dev, + libvorbis-dev, + zlib1g-dev +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/simage.git +Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/simage.git +Homepage: https://bitbucket.org/Coin3D/simage Package: libsimage-dev Architecture: any -Section: libdevel Multi-Arch: foreign -Depends: - libgif-dev, - libjpeg-dev, - libpng-dev, - libsimage20 (= ${binary:Version}), - libsndfile1-dev, - libtiff-dev, - libvorbis-dev, - pkg-config, - zlib1g-dev, - ${misc:Depends} +Section: libdevel +Depends: libgif-dev, + libjpeg-dev, + libpng-dev, + libsimage20 (= ${binary:Version}), + libsndfile1-dev, + libtiff-dev, + libvorbis-dev, + pkg-config, + zlib1g-dev, + ${misc:Depends} Description: generic interface to various image file format libraries. Development files. The simage library provides a simplified and uniform interface to many image file format libraries, and it includes internal support for some @@ -42,13 +40,11 @@ Package: libsimage20 Architecture: any -Pre-Depends: - ${misc:Pre-Depends} Multi-Arch: same Section: libs -Depends: - ${misc:Depends}, - ${shlibs:Depends} +Depends: ${misc:Depends}, + ${shlibs:Depends} +Pre-Depends: ${misc:Pre-Depends} Description: generic interface to various image file format libraries The simage library provides a simplified and uniform interface to many image file format libraries, and it includes internal support for some diff -Nru simage-1.7.1~2c958a6.dfsg/debian/copyright simage-1.7.1~2c958a6.dfsg/debian/copyright --- simage-1.7.1~2c958a6.dfsg/debian/copyright 2013-10-26 20:09:16.000000000 +0000 +++ simage-1.7.1~2c958a6.dfsg/debian/copyright 2016-09-04 16:52:14.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: simage Source: https://bitbucket.org/Coin3D/simage diff -Nru simage-1.7.1~2c958a6.dfsg/debian/patches/01_configure-shared-static.patch simage-1.7.1~2c958a6.dfsg/debian/patches/01_configure-shared-static.patch --- simage-1.7.1~2c958a6.dfsg/debian/patches/01_configure-shared-static.patch 2013-10-26 20:01:20.000000000 +0000 +++ simage-1.7.1~2c958a6.dfsg/debian/patches/01_configure-shared-static.patch 2016-09-04 16:52:14.000000000 +0000 @@ -1,3 +1,4 @@ +Description: _configure shared static --- simage-1.7.0.obsolete.0.299751654573814/configure 2010-02-26 09:47:31.000000000 -0600 +++ simage-1.7.0/configure 2010-02-27 14:25:52.000000000 -0600 @@ -3819,19 +3819,6 @@ diff -Nru simage-1.7.1~2c958a6.dfsg/debian/patches/10_change_stderr.patch simage-1.7.1~2c958a6.dfsg/debian/patches/10_change_stderr.patch --- simage-1.7.1~2c958a6.dfsg/debian/patches/10_change_stderr.patch 1970-01-01 00:00:00.000000000 +0000 +++ simage-1.7.1~2c958a6.dfsg/debian/patches/10_change_stderr.patch 2016-09-06 17:59:19.000000000 +0000 @@ -0,0 +1,198 @@ +Description: Replace stderr by stdout in example. + Avoid output to stderr. +Author: Anton Gladky +Last-Update: 2016-09-06 + +--- simage-1.7.1~2c958a6.dfsg.orig/examples/simage-convert.c ++++ simage-1.7.1~2c958a6.dfsg/examples/simage-convert.c +@@ -28,7 +28,7 @@ + static void + usage(const char * argv0) + { +- fprintf(stderr, "Usage:\n %s [-newsize ] [-scale ] [-alphathreshold ] [-addalpha ] [-setundef]\n",argv0); ++ fprintf(stdout, "Usage:\n %s [-newsize ] [-scale ] [-alphathreshold ] [-addalpha ] [-setundef]\n",argv0); + } + + int main(int argc, char ** argv) +@@ -124,30 +124,30 @@ int main(int argc, char ** argv) + else { + ext = strrchr(outfile, '.'); + if (ext == NULL) { +- fprintf(stderr,"outfile has no valid extension\n"); ++ fprintf(stdout,"outfile has no valid extension\n"); + return -1; + } + else { + ext++; /* skip period */ + if (!simage_check_save_supported(ext)) { +- fprintf(stderr,"Extension '%s' not supported for writing by simage\n", ++ fprintf(stdout,"Extension '%s' not supported for writing by simage\n", + ext); + save = 0; + } + } + } + +- fprintf(stderr,"read image: %s...", infile); ++ fprintf(stdout,"read image: %s...", infile); + buf = simage_read_image(infile, &w, &h, &nc); + if (buf) { +- fprintf(stderr,"done\n"); ++ fprintf(stdout,"done\n"); + } + else { +- fprintf(stderr,"Unable to read file\n", argv[1]); ++ fprintf(stdout,"Unable to read file\n", argv[1]); + return -1; + } + +- fprintf(stderr,"image size: (%d, %d), components: %d\n", ++ fprintf(stdout,"image size: (%d, %d), components: %d\n", + w, h, nc); + + if (xmul > 0.0f) { +@@ -157,11 +157,11 @@ int main(int argc, char ** argv) + if (neww > 0 && newh > 0 && (neww != w || newh != h)) { + unsigned char * newbuf; + +- fprintf(stderr,"resizing image: (%d, %d) to (%d %d)...", ++ fprintf(stdout,"resizing image: (%d, %d) to (%d %d)...", + w, h, neww, newh); + newbuf = simage_resize(buf, w, h, nc, + neww, newh); +- fprintf(stderr,"done\n"); ++ fprintf(stdout,"done\n"); + simage_free_image(buf); + buf = newbuf; + w = neww; +@@ -173,12 +173,12 @@ int main(int argc, char ** argv) + int ac; + int w2, h2, nc2; + unsigned char * buf2 = simage_read_image(addalpha, &w2, &h2, &nc2); +- fprintf(stderr,"alpha size: %d %d %d\n", w2, h2, nc2); ++ fprintf(stdout,"alpha size: %d %d %d\n", w2, h2, nc2); + if (buf2) { + if (w == w2 && h == h2 && (nc2 == 1 || nc2 == 2 || nc2 == 4)) { + unsigned char * dstbuf = buf; + if (nc == 1 || nc == 3) { +- fprintf(stderr,"adding alpha channel\n"); ++ fprintf(stdout,"adding alpha channel\n"); + dstbuf = (unsigned char*) malloc(w*h*(nc+1)); + for (y = 0; y < h; y++) { + for (x = 0; x < w; x++) { +@@ -193,7 +193,7 @@ int main(int argc, char ** argv) + if (nc2 == 2) ac = 1; + if (nc2 == 4) ac = 3; + +- fprintf(stderr,"merging in alpha channel\n"); ++ fprintf(stdout,"merging in alpha channel\n"); + for (y = 0; y < h; y++) { + for (x = 0; x < w; x++) { + dstbuf[y*w*nc + x*nc + (nc-1)] = buf2[y*w*nc2 + x * nc2 + ac]; +@@ -205,11 +205,11 @@ int main(int argc, char ** argv) + } + } + else { +- fprintf(stderr,"Unable to add alpha channel\n"); ++ fprintf(stdout,"Unable to add alpha channel\n"); + } + } + else { +- fprintf(stderr,"Unable to read alpha file: %s\n", addalpha); ++ fprintf(stdout,"Unable to read alpha file: %s\n", addalpha); + } + } + +@@ -238,7 +238,7 @@ int main(int argc, char ** argv) + } + p++; + } +- fprintf(stderr,"alpha threshold changed %d pixels\n", cnt); ++ fprintf(stdout,"alpha threshold changed %d pixels\n", cnt); + } + + if (gray && nc >= 3) { +@@ -272,7 +272,7 @@ int main(int argc, char ** argv) + } + p += nc; + } +- fprintf(stderr,"undef'ed %d pixels\n", cnt); ++ fprintf(stdout,"undef'ed %d pixels\n", cnt); + } + if (mirrory) { + unsigned char * tmp = (unsigned char*) malloc(w*nc); +@@ -288,15 +288,15 @@ int main(int argc, char ** argv) + } + + if (save) { +- fprintf(stderr,"save image '%s'...", outfile); ++ fprintf(stdout,"save image '%s'...", outfile); + ret = simage_save_image(argv[2], buf, w, h, nc, ext); + simage_free_image(buf); + if (ret != 1) { +- fprintf(stderr,"error: %s\n", simage_get_last_error()); ++ fprintf(stdout,"error: %s\n", simage_get_last_error()); + return -1; + } + else { +- fprintf(stderr,"done\n"); ++ fprintf(stdout,"done\n"); + } + } + return 0; +--- simage-1.7.1~2c958a6.dfsg.orig/examples/simage-read-line-test.c ++++ simage-1.7.1~2c958a6.dfsg/examples/simage-read-line-test.c +@@ -28,7 +28,7 @@ + static void + usage(const char * argv0) + { +- fprintf(stderr, "Usage:\n %s \n"); ++ fprintf(stdout, "Usage:\n %s \n"); + } + + int main(int argc, char ** argv) +@@ -48,7 +48,7 @@ int main(int argc, char ** argv) + image = s_image_open(argv[1], 1); + + if (!image) { +- fprintf(stderr,"Unable to open file: %s\n" ,argv[1]); ++ fprintf(stdout,"Unable to open file: %s\n" ,argv[1]); + return -1; + } + +@@ -56,28 +56,28 @@ int main(int argc, char ** argv) + h = s_image_height(image); + nc = s_image_components(image); + +- fprintf(stderr,"testing file: %s, %d %d %d\n", argv[1], w, h, nc); ++ fprintf(stdout,"testing file: %s, %d %d %d\n", argv[1], w, h, nc); + + row = (unsigned char*) malloc(w*nc); + +- fprintf(stderr,"testing step: %s, %d %d %d\n", argv[1], w, h, nc); ++ fprintf(stdout,"testing step: %s, %d %d %d\n", argv[1], w, h, nc); + for (i = 0; i < h; i += 146) { + if (!s_image_read_line(image, i, row)) { +- fprintf(stderr,"failed to read line %d\n", i); ++ fprintf(stdout,"failed to read line %d\n", i); + } + } + +- fprintf(stderr,"testing normal: %s, %d %d %d\n", argv[1], w, h, nc); ++ fprintf(stdout,"testing normal: %s, %d %d %d\n", argv[1], w, h, nc); + for (i = 0; i < h; i++) { + if (!s_image_read_line(image, i, row)) { +- fprintf(stderr,"failed to read line %d\n", i); ++ fprintf(stdout,"failed to read line %d\n", i); + } + } + +- fprintf(stderr,"testing backwards: %s, %d %d %d\n", argv[1], w, h, nc); ++ fprintf(stdout,"testing backwards: %s, %d %d %d\n", argv[1], w, h, nc); + for (i = h-1; i >=0; i--) { + if (!s_image_read_line(image, i, row)) { +- fprintf(stderr,"failed to read line %d\n", i); ++ fprintf(stdout,"failed to read line %d\n", i); + } + } + diff -Nru simage-1.7.1~2c958a6.dfsg/debian/patches/libpng16.patch simage-1.7.1~2c958a6.dfsg/debian/patches/libpng16.patch --- simage-1.7.1~2c958a6.dfsg/debian/patches/libpng16.patch 2016-01-07 12:12:15.000000000 +0000 +++ simage-1.7.1~2c958a6.dfsg/debian/patches/libpng16.patch 2016-09-04 16:52:14.000000000 +0000 @@ -1,6 +1,6 @@ Description: Fix FTBFS with changed libpng 1.6 api +Bug-Debian: https://bugs.debian.org/648126 Author: Tobias Frost -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648126 Last-Update: 2016-01-07 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ diff -Nru simage-1.7.1~2c958a6.dfsg/debian/patches/series simage-1.7.1~2c958a6.dfsg/debian/patches/series --- simage-1.7.1~2c958a6.dfsg/debian/patches/series 2016-01-07 12:12:19.000000000 +0000 +++ simage-1.7.1~2c958a6.dfsg/debian/patches/series 2016-09-06 17:58:44.000000000 +0000 @@ -1,2 +1,3 @@ 01_configure-shared-static.patch libpng16.patch +10_change_stderr.patch diff -Nru simage-1.7.1~2c958a6.dfsg/debian/source/include-binaries simage-1.7.1~2c958a6.dfsg/debian/source/include-binaries --- simage-1.7.1~2c958a6.dfsg/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ simage-1.7.1~2c958a6.dfsg/debian/source/include-binaries 2016-09-04 17:22:32.000000000 +0000 @@ -0,0 +1 @@ +debian/tests/a_in.png Binary files /tmp/tmpqeumKQ/IsELNruLUD/simage-1.7.1~2c958a6.dfsg/debian/tests/a_in.png and /tmp/tmpqeumKQ/R5WBqNJdtV/simage-1.7.1~2c958a6.dfsg/debian/tests/a_in.png differ diff -Nru simage-1.7.1~2c958a6.dfsg/debian/tests/check1 simage-1.7.1~2c958a6.dfsg/debian/tests/check1 --- simage-1.7.1~2c958a6.dfsg/debian/tests/check1 1970-01-01 00:00:00.000000000 +0000 +++ simage-1.7.1~2c958a6.dfsg/debian/tests/check1 2016-09-04 17:18:38.000000000 +0000 @@ -0,0 +1,20 @@ +#!/bin/sh +# autopkgtest check for simage +# (C) 2016 Anton Gladky + +set -e + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cp debian/tests/a_in.png $WORKDIR/ +cp examples/simage-read-line-test.c $WORKDIR/ + +cd $WORKDIR + +gcc simage-read-line-test.c -lsimage -o simage-read-line-test +echo "build: OK" + +./simage-read-line-test a_in.png a_out.png +ls -ln + +echo "run: OK" diff -Nru simage-1.7.1~2c958a6.dfsg/debian/tests/check2 simage-1.7.1~2c958a6.dfsg/debian/tests/check2 --- simage-1.7.1~2c958a6.dfsg/debian/tests/check2 1970-01-01 00:00:00.000000000 +0000 +++ simage-1.7.1~2c958a6.dfsg/debian/tests/check2 2016-09-04 17:17:51.000000000 +0000 @@ -0,0 +1,20 @@ +#!/bin/sh +# autopkgtest check for simage +# (C) 2016 Anton Gladky + +set -e + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cp debian/tests/a_in.png $WORKDIR/ +cp examples/simage-convert.c $WORKDIR/ + +cd $WORKDIR + +gcc simage-convert.c -lsimage -o simage-convert +echo "build: OK" + +./simage-convert a_in.png a_out.png +ls -ln + +echo "run: OK" diff -Nru simage-1.7.1~2c958a6.dfsg/debian/tests/control simage-1.7.1~2c958a6.dfsg/debian/tests/control --- simage-1.7.1~2c958a6.dfsg/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ simage-1.7.1~2c958a6.dfsg/debian/tests/control 2016-09-04 17:17:57.000000000 +0000 @@ -0,0 +1,2 @@ +Tests: check1 check2 +Depends: libsimage-dev, build-essential