Changeset 09bd226

Timestamp:

2015-05-18T02:23:56Z (9 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:

• .travis.yml (modified) (1 diff)
• configure (modified) (1 diff)
• debian/control (modified) (1 diff)
• protocols/skype/Makefile (modified) (3 diffs)
• protocols/skype/skyped.1 (added)

.travis.yml

@@ -8 +8 @@
 before_install:
  - sudo apt-get update -qq
- - sudo apt-get install --no-install-recommends -qq asciidoc libevent-dev libpurple-dev check
+ - sudo apt-get install --no-install-recommends -qq libevent-dev libpurple-dev check
  - wget http://dump.dequis.org/indexed/bitlbee-travis-libs/libotr5{,-dev}_4.1.0-2~bpo70+1_amd64.deb
  - sudo dpkg -i *.deb

configure

@@ -688 +688 @@
         fi
         echo "DOC=1" >> Makefile.settings
-
-        if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
-                # skype also needs asciidoc
-                if ! type a2x > /dev/null 2> /dev/null; then
-                        echo
-                        echo 'WARNING: The skyped man page requires asciidoc. It will not be generated.'
-                else
-                        echo "ASCIIDOC=1" >> Makefile.settings
-                fi
-        fi
 fi
 

debian/control

@@ -5 +5 @@
 Uploaders: Jelmer Vernooij <jelmer@debian.org>
 Standards-Version: 3.9.5
-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
+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~)
 Homepage: http://www.bitlbee.org/
 Vcs-Bzr: http://code.bitlbee.org/bitlbee/

protocols/skype/Makefile

@@ -7 +7 @@
 INSTALL = install
 
-
-ifdef ASCIIDOC
-MANPAGES = skyped.1
-else
-MANPAGES =
-endif
-
-all: $(MANPAGES)
-
+all:
 clean:
-        rm -f $(MANPAGES)
 
 # take this from the kernel
@@ -29 +20 @@
 
 install-doc: doc
-ifdef ASCIIDOC
         $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
         $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(MANDIR)/man1
-endif
 
 uninstall-doc:
@@ -38 +27 @@
 
 %.1: $(_SRCDIR_)%.txt $(_SRCDIR_)asciidoc.conf
-        a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage -D . $<
+        a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage $<