[DRE-commits] [SCM] samizdat.git branch, master, updated. upstream/0.6.2.20110917-3-g49d9f39

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit 49d9f399d57f3d8ebaf169fc872649ff687101fa
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Tue Sep 20 21:49:05 2011 +0300

    fix installation paths

diff --git a/debian/rules b/debian/rules
index d496040..7d6386f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@
 override_dh_install:
 	dh_install
 	chmod 755 debian/samizdat/usr/share/samizdat/cgi-bin/*
+	mv debian/samizdat/etc/samizdat/sites/config.yaml debian/samizdat/etc/samizdat/sites/samizdat.yaml
 	for lang in be de en eo es fr ja pl ru ua; do \
 		mkdir -p debian/samizdat/usr/share/locale/$$lang/LC_MESSAGES; \
 		msgfmt po/$$lang.po -o debian/samizdat/usr/share/locale/$$lang/LC_MESSAGES/samizdat.mo; \
diff --git a/debian/samizdat.install b/debian/samizdat.install
index bda96bd..8845005 100644
--- a/debian/samizdat.install
+++ b/debian/samizdat.install
@@ -1,5 +1,5 @@
-data/* /usr/share/samizdat/
+data/samizdat/* /usr/share/samizdat/
 cgi-bin/* /usr/share/samizdat/cgi-bin/
-data/samizdat/sites.yaml /etc/samizdat
-data/samizdat/defaults.yaml /etc/samizdat
-data/samizdat/config.yaml /etc/samizdat/sites/samizdat.yaml
+data/samizdat/sites.yaml /etc/samizdat/
+data/samizdat/defaults.yaml /etc/samizdat/
+data/samizdat/config.yaml /etc/samizdat/sites/

-- 
samizdat.git