aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-06-18 16:33:51 -0300
committerSilvio Rhatto <rhatto@riseup.net>2015-06-18 16:33:51 -0300
commit29d1d44e723441d76cd5a426b94c9e0d0feef01b (patch)
tree883390b5211e65edc5fe469590c9acc87d4e54a1
parente6f6d21f9955ac7c428d8fe43def599c6bc36a8b (diff)
parentf284623dc005b531f36b337553b771e57a247752 (diff)
downloadkeyringer-29d1d44e723441d76cd5a426b94c9e0d0feef01b.tar.gz
keyringer-29d1d44e723441d76cd5a426b94c9e0d0feef01b.tar.bz2
Merge branch 'develop'
-rw-r--r--Makefile2
l---------README.md (renamed from README)0
-rw-r--r--development.mdwn1
3 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 07513f2..2303f98 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ install_bin:
$(INSTALL) -D --mode=0755 keyringer $(DESTDIR)/$(PREFIX)/bin/keyringer
install_doc:
- $(INSTALL) -D --mode=0644 index.mdwn $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/README
+ $(INSTALL) -D --mode=0644 index.mdwn $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/README.md
$(INSTALL) -D --mode=0644 LICENSE $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE)/LICENSE
install_man:
diff --git a/README b/README.md
index 9f2fbdb..9f2fbdb 120000
--- a/README
+++ b/README.md
diff --git a/development.mdwn b/development.mdwn
index db67119..670dcbd 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -99,3 +99,4 @@ References
* [Generating pristine tarballs from git repositories](http://joeyh.name/blog/entry/generating_pristine_tarballs_from_git_repositories/).
* [Debian Packaging](https://wiki.debian.org/Packaging).
* [Debian Upstream Guide](https://wiki.debian.org/UpstreamGuide).
+* [DanielKahnGillmor/preferred_packaging - Debian Wiki](https://wiki.debian.org/DanielKahnGillmor/preferred_packaging).