Changeset 51b14b8


Ignore:
Timestamp:
2015-05-28T17:46:47Z (5 years ago)
Author:
dequis <dx@…>
Children:
c720890
Parents:
d2d2b80 (diff), bef322e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'develop' into feat/hip-cat

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • debian/control

    rd2d2b80 r51b14b8  
    2222Architecture: any
    2323Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
    24 Provides: bitlbee
     24Provides: bitlbee (= ${source:Version})
    2525Conflicts: bitlbee
    2626Replaces: bitlbee
  • protocols/skype/Makefile

    rd2d2b80 r51b14b8  
    1717        ./test.py
    1818
    19 doc: $(MANPAGES)
    20 
    21 install-doc: doc
     19install-doc:
    2220        $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
    23         $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(MANDIR)/man1
     21        $(INSTALL) -m644 skyped.1 $(DESTDIR)$(MANDIR)/man1
    2422
    2523uninstall-doc:
Note: See TracChangeset for help on using the changeset viewer.