Control: tags -1 patch On Thu, 26 May 2016 22:50:53 -0700 Mike Gerow <ge...@mgerow.com> wrote:
Hi Mike, > Hello! I'm new, and I saw your newcomer tag! Since this is tracked in a git > repo is it appropriate to just include the git patch here? Either way I've > included it below. > > I also removed jasper from the add_autotools.diff by stepping through it with > quilt, let me know if the right thing to do here is to add a new diff instead. > > --- > debian/changelog | 4 ++++ > debian/control | 2 +- > debian/patches/add_autotools.diff | 2 +- > debian/patches/no_jasper.diff | 12 ++++++++++++ > debian/patches/series | 1 + > 5 files changed, 19 insertions(+), 2 deletions(-) > create mode 100644 debian/patches/no_jasper.diff > > diff --git a/debian/changelog b/debian/changelog > index b2d203a..2576bbd 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -1,7 +1,11 @@ > dcraw (9.26-2) UNRELEASED; urgency=medium > > + [ Tobias Frost ] > * dccleancrw: Patch to bail out if file cannot be opened. Closes: #715777 > > + [ Mike Gerow ] > + * Remove libjasper-dev dependency. Closes: #818195 > + > -- Tobias Frost <t...@debian.org> Sat, 30 Apr 2016 23:46:28 +0200 > > dcraw (9.26-1) unstable; urgency=medium > diff --git a/debian/control b/debian/control > index c27a7b0..87c7f00 100644 > --- a/debian/control > +++ b/debian/control > @@ -2,7 +2,7 @@ Source: dcraw > Section: graphics > Priority: optional > Maintainer: Debian QA Group <packa...@qa.debian.org> > -Build-Depends: debhelper (>= 9), dh-autoreconf, libjpeg-dev, liblcms2-dev, libjasper-dev > +Build-Depends: debhelper (>= 9), dh-autoreconf, libjpeg-dev, liblcms2-dev > Standards-Version: 3.9.8 > Vcs-Git: https://anonscm.debian.org/git/collab-maint/dcraw.git > Vcs-Browser: https://anonscm.debian.org/git/collab-maint/dcraw.git > diff --git a/debian/patches/add_autotools.diff b/debian/patches/add_autotools.diff > index 75095bb..1eb0157 100644 > --- a/debian/patches/add_autotools.diff > +++ b/debian/patches/add_autotools.diff > @@ -18,7 +18,7 @@ Add configure.in and Makefile.in for a rudimentary AutoTools build system > +OBJ = dcraw.o parse.o fujiturn.o fujiturn16.o fuji_green.o clean_crw.o @LIBOBJS@ > + > +all: $(OBJ) > -+ $(CC) @LDFLAGS@ -o dcraw dcraw.o -ljpeg -llcms2 -ljasper @LIBS@ > ++ $(CC) @LDFLAGS@ -o dcraw dcraw.o -ljpeg -llcms2 @LIBS@ > + $(CC) @LDFLAGS@ -o dcparse parse.o @LIBS@ > + $(CC) @LDFLAGS@ -o dcfujiturn fujiturn.o @LIBS@ > + $(CC) @LDFLAGS@ -o dcfujiturn16 fujiturn16.o @LIBS@ > diff --git a/debian/patches/no_jasper.diff b/debian/patches/no_jasper.diff > new file mode 100644 Thanks for the patch. From here the patch looks fine. However as there has been some acticity on the packaging, namely the Astronomy Working Group decided to ITA it, see #745615), I will only do an upload to the DELAYED/15 queue, to avoid interfering with the team efforts. (CC'ing them to make sure that they are aware.) -- tobi (Will issue an NMU-diff but will NOT to the repository at collab-maint)
