[med-svn] r11864 - trunk/packages/camitk/trunk/debian

[Emmanuel Promayon]

Author: promayon-guest
Date: 2012-07-22 12:31:32 +0000 (Sun, 22 Jul 2012)
New Revision: 11864

Modified:
   trunk/packages/camitk/trunk/debian/changelog
   trunk/packages/camitk/trunk/debian/rules
Log:
FIXED jquery.js cannot be included in doc package
FIXED manual page now included
FIXED ITP notification in changelog



Modified: trunk/packages/camitk/trunk/debian/changelog
===================================================================
--- trunk/packages/camitk/trunk/debian/changelog	2012-07-20 16:57:37 UTC (rev 11863)
+++ trunk/packages/camitk/trunk/debian/changelog	2012-07-22 12:31:32 UTC (rev 11864)
@@ -1,5 +1,5 @@
 camitk (3.0.2-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #682107)
+  * Initial release (Closes: #682109)
 
  -- Andreas Tille <tille at debian.org>  Mon, 09 Jul 2012 14:55:45 +0200

Modified: trunk/packages/camitk/trunk/debian/rules
===================================================================
--- trunk/packages/camitk/trunk/debian/rules	2012-07-20 16:57:37 UTC (rev 11863)
+++ trunk/packages/camitk/trunk/debian/rules	2012-07-22 12:31:32 UTC (rev 11864)
@@ -43,12 +43,14 @@
 # let's be smart with doc
 override_dh_auto_build-indep:
 	$(MAKE) -C obj-* apidoc
+	# remove the javascript search field
+	rm -f obj-*/share/apidoc/html/jquery.js
 
 # No tests needed for docs
 override_dh_auto_test-indep:
 
 override_dh_install:
-	# camitk dynamic library
+	# camitk dynamic library
 	dh_install -p$(pkg_lib) debian/tmp/usr/lib/lib*.so.* usr/lib 
 	dh_install -p$(pkg_lib) --autodest debian/tmp/usr/lib/camitk-$(VER_SHORT)/actions/lib*.so
 	dh_install -p$(pkg_lib) --autodest debian/tmp/usr/lib/camitk-$(VER_SHORT)/components/lib*.so
@@ -59,22 +61,18 @@
 	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/camitk-$(VER_SHORT)/lib*.a
 	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include
 	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/cmake/*.cmake 
-#dh_installman -p$(pgk_dev) applications/wizard/camitk-wizard.1
+	dh_installman -p$(pkg_dev) $(CURDIR)/applications/wizard/camitk-wizard.1
 
 	# api doc
 	dh_install -p$(pkg_doc) --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/apidoc
 
-	# all test data
+	# all test data
 	dh_install -p$(pkg_data) --autodest debian/tmp/usr/share/camitk-$(VER_SHORT)/testdata
 
-	# imp
+	# imp
 	dh_install -p$(pkg_imp) debian/tmp/usr/bin/camitk-imp
-#dh_installman -p$(pgk_imp) applications/imp/camitk-imp.1
+	dh_installman -p$(pkg_imp) $(CURDIR)/applications/imp/camitk-imp.1
 
-override_dh_installdocs:
-	rm -f $(CURDIR)/debian/tmp/usr/share/camitk-$(VER_SHORT)/apidoc/html/jquery.js
-	dh_installdocs
-	
 # see http://lists.debian.org/debian-mentors/2012/07/msg00124.html
 get-orig-source:
 	PERL_LWP_SSL_VERIFY_HOSTNAME=0 uscan --rename --verbose --force-download --destdir=../tarballs