← Back to branch summary

~ubuntu-branches/ubuntu/trusty/argyll/trusty-proposed

« back to all changes in this revision

Viewing changes to jpg/Jamfile

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2014-02-12 00:35:39 UTC
  • mfrom: (13.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20140212003539-24tautzlitsiz61w
Tags: 1.5.1-5ubuntu1
https://launchpad.net/bugs/1275572
* Merge from Debian unstable. (LP: #1275572) Remaining changes:
  - debian/control:
    + Build-depend on libtiff-dev rather than libtiff4-dev.
  - debian/control, debian/patches/06_fix_udev_rule.patch:
    + Fix udev rules to actually work; ENV{ACL_MANAGE} has
      stopped working ages ago, and with logind it's now the
      "uaccess" tag. Dropping also consolekit from Recommends.
  - debian/patches/drop-usb-db.patch:
    + Use hwdb builtin, instead of the obsolete usb-db
      in the udev rules.
* debian/patches/05_ftbfs-underlinkage.diff:
  - Dropped change, no needed anymore.
* Refresh the patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
jpg/Jamfile
5
5
 
6
6
# Run configure if it seems to be needed
7
7
if $(UNIX) {
8
 
        GenFileNND config.h : "(cd $(SUBDIR); chmod +x configure ; ./configure)" : configure ;
 
8
        GenFileNND jconfig.h : "(cd $(SUBDIR); chmod +x configure ; ./configure)" : configure ;
9
9
}
10
10
 
11
11
# else copy them
22
22
          jdsample.c jdcolor.c jdmerge.c jquant1.c jquant2.c jdatasrc.c jaricom.c
23
23
          jerror.c jmemmgr.c jutils.c jmemmgr.c jmemnobs.c ;
24
24
 
25
 
Library libjpg : $(LIBSRCS) ;
 
25
Library libjpeg : $(LIBSRCS) ;
26
26