Some minor fixes for Debian packaging.
authorMaximilian Wilhelm <max@rfc2324.org>
Tue, 13 May 2008 23:51:57 +0000 (01:51 +0200)
committerMaximilian Wilhelm <max@rfc2324.org>
Tue, 13 May 2008 23:51:57 +0000 (01:51 +0200)
Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>

debian/changelog
debian/control
debian/rules
debian/ssh-keysync-server.postinst

index e82a7e1..f7f1bbc 100644 (file)
@@ -2,7 +2,8 @@ ssh-keysync (0.5) unstable; urgency=low
 
   * Initial really official release.
   * Removed all RBM references as this software was developed in private.
-  * Pimped coding style
+  * Cleaned up debian/ dir
+  * Let client depend on openssh-client instead of ssh
 
  -- Maximilian Wilhelm <max@rfc2324.org>  Wed, 14 May 2008 00:40:40 +0200
 
index 2d177cb..3da42ee 100644 (file)
@@ -30,7 +30,7 @@ Description: server-side script for generating/sharing ssh_known_hosts
 
 Package: ssh-keysync-client
 Architecture: all
-Depends: ssh, wget, netkit-ping | iputils-ping
+Depends: openssh-client, wget, netkit-ping | iputils-ping
 Description: client side script for distributing ssh_known_hosts
  This package contains the client part of ssh-keysync, a system to generate
  and distribute ssh_known_hosts files from the public keys of your hosts.
index 4ed1d1f..1e789a9 100755 (executable)
@@ -36,11 +36,14 @@ install: build
 
 
        ## ssh-keysync-client ##
-       install -m 755 -o root -g root    $(CURDIR)/files/client/ssh-keysync $(CURDIR)/debian/ssh-keysync-client/usr/sbin
        install -m 640 -o root -g root    $(CURDIR)/files/client/ssh-keysync-client.conf $(CURDIR)/debian/ssh-keysync-client/etc/ssh-keysync
 
+       install -m 755 -o root -g root    $(CURDIR)/files/client/ssh-keysync $(CURDIR)/debian/ssh-keysync-client/usr/sbin
+
 
        ## ssh-keysync-server ##
+       install -m 640 -o root -g root    $(CURDIR)/files/server/ssh-keysync-server.conf $(CURDIR)/debian/ssh-keysync-server/etc/ssh-keysync
+
        install -m 755 -o root -g root    $(CURDIR)/files/server/{upgrade_sshkeysync,ssh-keysync-{adddomain,merge}} $(CURDIR)/debian/ssh-keysync-server/usr/bin
        mkdir -p  $(CURDIR)/debian/ssh-keysync-server/usr/share/perl5/
        cp -R $(CURDIR)/files/server/SshKeySync $(CURDIR)/debian/ssh-keysync-server/usr/share/perl5/
index f1aa77c..8fa6232 100644 (file)
@@ -63,7 +63,7 @@ fi
 ##
 # If apache is installed, place a config in conf.d
 if dpkg -l apache | grep -q ^ii; then
-       cp /usr/share/doc/ssh-keysync-server/apache-example.conf /etc/apache/conf.d/ssh-keysync-server.conf
+       cp /usr/share/doc/ssh-keysync-server/examples/apache-example.conf /etc/apache/conf.d/ssh-keysync-server.conf
        /etc/init.d/apache reload
 fi