Changeset 09bd226


Ignore:
Timestamp:
2015-05-18T02:23:56Z (5 years ago)
Author:
dequis <dx@…>
Branches:
master
Children:
08a9323, fe63ed3
Parents:
8cbe2b6
git-author:
dequis <dx@…> (18-05-15 02:22:23)
git-committer:
dequis <dx@…> (18-05-15 02:23:56)
Message:

Include prebuilt skyped manpage, remove asciidoc dependency

Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • .travis.yml

    r8cbe2b6 r09bd226  
    88before_install:
    99 - sudo apt-get update -qq
    10  - sudo apt-get install --no-install-recommends -qq asciidoc libevent-dev libpurple-dev check
     10 - sudo apt-get install --no-install-recommends -qq libevent-dev libpurple-dev check
    1111 - wget http://dump.dequis.org/indexed/bitlbee-travis-libs/libotr5{,-dev}_4.1.0-2~bpo70+1_amd64.deb
    1212 - sudo dpkg -i *.deb
  • configure

    r8cbe2b6 r09bd226  
    688688        fi
    689689        echo "DOC=1" >> Makefile.settings
    690 
    691         if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
    692                 # skype also needs asciidoc
    693                 if ! type a2x > /dev/null 2> /dev/null; then
    694                         echo
    695                         echo 'WARNING: The skyped man page requires asciidoc. It will not be generated.'
    696                 else
    697                         echo "ASCIIDOC=1" >> Makefile.settings
    698                 fi
    699         fi
    700690fi
    701691
  • debian/control

    r8cbe2b6 r09bd226  
    55Uploaders: Jelmer Vernooij <jelmer@debian.org>
    66Standards-Version: 3.9.5
    7 Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~), asciidoc
     7Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~)
    88Homepage: http://www.bitlbee.org/
    99Vcs-Bzr: http://code.bitlbee.org/bitlbee/
  • protocols/skype/Makefile

    r8cbe2b6 r09bd226  
    77INSTALL = install
    88
    9 
    10 ifdef ASCIIDOC
    11 MANPAGES = skyped.1
    12 else
    13 MANPAGES =
    14 endif
    15 
    16 all: $(MANPAGES)
    17 
     9all:
    1810clean:
    19         rm -f $(MANPAGES)
    2011
    2112# take this from the kernel
     
    2920
    3021install-doc: doc
    31 ifdef ASCIIDOC
    3222        $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
    3323        $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(MANDIR)/man1
    34 endif
    3524
    3625uninstall-doc:
     
    3827
    3928%.1: $(_SRCDIR_)%.txt $(_SRCDIR_)asciidoc.conf
    40         a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage -D . $<
     29        a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage $<
Note: See TracChangeset for help on using the changeset viewer.