[Fingerforce-commits] r163 - in /packages/fprint/fprintd/trunk/debian: control rules

[dererk at users.alioth.debian.org]

Author: dererk
Date: Wed Aug 25 11:02:04 2010
New Revision: 163

URL: http://svn.debian.org/wsvn/fingerforce/?sc=1&rev=163
Log:
Fixing manpages "missing", and cleaning trash.

Modified:
    packages/fprint/fprintd/trunk/debian/control
    packages/fprint/fprintd/trunk/debian/rules

Modified: packages/fprint/fprintd/trunk/debian/control
URL: http://svn.debian.org/wsvn/fingerforce/packages/fprint/fprintd/trunk/debian/control?rev=163&op=diff
==============================================================================
--- packages/fprint/fprintd/trunk/debian/control (original)
+++ packages/fprint/fprintd/trunk/debian/control Wed Aug 25 11:02:04 2010
@@ -12,7 +12,7 @@
 
 Package: fprintd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, policykit-1
 Description: libfprint daemon implementation for fingerprint scanning over D-Bus
  fprintd is a D-Bus daemon that offers libfprint functionality over the D-Bus
  interprocess communication bus
@@ -23,7 +23,7 @@
 
 Package: libpam-fprintd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, fprintd
 Description: PAM module allowing authentication fprintd D-Bus implementation
  pam_fprintd is a PAM module which uses the fprintd libfprint's fingerprint 
  verification functionality to implement a fingerprint-based authentication 
@@ -34,8 +34,10 @@
  example ssh, gdm/kdm/xdm, most screen savers, login, su, sudo, etc.
 
 Package: fprintd-doc
+Section: doc
+Depends: ${misc:Depends}
 Architecture: all
-Description: libfprint daemon implementation for fingerprint scanning over D-Bus, documentation package 
+Description: libfprint daemon for fingerprint scanning over D-Bus, documentation package
  fprintd is a D-Bus daemon that offers libfprint functionality over the D-Bus
  interprocess communication bus
  .

Modified: packages/fprint/fprintd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/fingerforce/packages/fprint/fprintd/trunk/debian/rules?rev=163&op=diff
==============================================================================
--- packages/fprint/fprintd/trunk/debian/rules (original)
+++ packages/fprint/fprintd/trunk/debian/rules Wed Aug 25 11:02:04 2010
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
+#export DH_VERBOSE=1
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -21,7 +20,7 @@
 endif
 	./autogen.sh
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --libexecdir=\$${prefix}/lib/fprintd \
-		--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-pam  --libdir=/lib \
+		--sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --libdir=/lib --enable-pam \
 		--enable-gtk-doc --enable-gtk-doc-pdf --enable-gtk-doc-html CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 build: build-stamp
@@ -64,15 +63,23 @@
 	dh_install -plibpam-fprintd debian/fprintd/lib/security/*.so lib/security
 	
 	# -> fprintd-doc
-	dh_installdirs -pfprintd-doc debian/fprintd/usr/share/doc/fprintd-doc
+	dh_installdirs -pfprintd-doc usr/share/doc/fprintd-doc
 	dh_install -pfprintd-doc debian/fprintd/usr/share/gtk-doc/html usr/share/doc/fprintd-doc
+	dh_link -pfprintd-doc usr/share/doc/fprintd-doc usr/share/gtk-doc/html/fprintd
+	dh_link -pfprintd-doc usr/share/doc/fprintd usr/share/gtk-doc/html/fprintd-doc
 	
 	# -> fprintd
 	# fprintd stores the fingerprints in /var/lib/fprint/
 	dh_installdirs -pfprintd var/lib/fprint
 	dh_install --sourcedir=debian/fprintd
+	# Links all binaries to the same manpage
+	dh_link -pfprintd usr/share/man/man1/fprintd.1.gz usr/share/man/man1/fprintd-delete.1.gz
+	dh_link -pfprintd usr/share/man/man1/fprintd.1.gz usr/share/man/man1/fprintd-enroll.1.gz
+	dh_link -pfprintd usr/share/man/man1/fprintd.1.gz usr/share/man/man1/fprintd-list.1.gz
+	dh_link -pfprintd usr/share/man/man1/fprintd.1.gz usr/share/man/man1/fprintd-verify.1.gz
 	# Trash
 	rm -rf debian/fprintd/usr/share/locale
+	rm -rf debian/fprintd/lib
 	# Provided by libpam-fprintd
 	rm -rf debian/fprintd/lib/security
 	# Provided by fprintd-doc