Changeset 51b14b8
- Timestamp:
- 2015-05-28T17:46:47Z (9 years ago)
- 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. - Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
debian/control
rd2d2b80 r51b14b8 22 22 Architecture: any 23 23 Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version}) 24 Provides: bitlbee 24 Provides: bitlbee (= ${source:Version}) 25 25 Conflicts: bitlbee 26 26 Replaces: bitlbee -
protocols/skype/Makefile
rd2d2b80 r51b14b8 17 17 ./test.py 18 18 19 doc: $(MANPAGES) 20 21 install-doc: doc 19 install-doc: 22 20 $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1 23 $(INSTALL) -m644 $(MANPAGES)$(DESTDIR)$(MANDIR)/man121 $(INSTALL) -m644 skyped.1 $(DESTDIR)$(MANDIR)/man1 24 22 25 23 uninstall-doc:
Note: See TracChangeset
for help on using the changeset viewer.