policykit-gnome r19 - in trunk: . examples po

[davidz svn gnome org]

Author: davidz
Date: Mon Apr 21 17:48:52 2008
New Revision: 19
URL: http://svn.gnome.org/viewvc/policykit-gnome?rev=19&view=rev

Log:
rename policy file to adhere to PolicyKit guidelines

See

 http://gitweb.freedesktop.org/?p=PolicyKit.git;a=commit;h=2b1a2a69f6366534609a0671f3f2e92369cb3fa1

for more details


Added:
   trunk/examples/org.gnome.policykit.examples.policy.in
      - copied, changed from r18, /trunk/examples/polkit-gnome-example.policy.in
Removed:
   trunk/examples/polkit-gnome-example.policy.in
Modified:
   trunk/examples/Makefile.am
   trunk/gtk-doc.make
   trunk/po/POTFILES.in

Modified: trunk/examples/Makefile.am
==============================================================================
--- trunk/examples/Makefile.am	(original)
+++ trunk/examples/Makefile.am	Mon Apr 21 17:48:52 2008
@@ -33,19 +33,19 @@
 # PolicyKit action definitions for this example
 #
 polkit_policydir = $(datadir)/PolicyKit/policy
-dist_polkit_policy_DATA =  polkit-gnome-example.policy
+dist_polkit_policy_DATA = org.gnome.policykit.examples.policy
 
 # You will need a recent intltool or the patch from this bug
 # http://bugzilla.gnome.org/show_bug.cgi?id=462312
 @INTLTOOL_POLICY_RULE@
 
-#check:
-#	$(POLKIT_POLICY_FILE_VALIDATE) $(dist_polkit_policy_DATA)
+check:
+	$(POLKIT_POLICY_FILE_VALIDATE) $(dist_polkit_policy_DATA)
 
-EXTRA_DIST = polkit-gnome-example.policy.in
+EXTRA_DIST = org.gnome.policykit.examples.policy.in
 
 CLEANFILES = $(BUILT_SOURCES)
-DISTCLEANFILES = polkit-gnome-example.policy
+DISTCLEANFILES = org.gnome.policykit.examples.policy
 
 clean-local :
 	rm -f *~

Copied: trunk/examples/org.gnome.policykit.examples.policy.in (from r18, /trunk/examples/polkit-gnome-example.policy.in)
==============================================================================

Modified: trunk/gtk-doc.make
==============================================================================
--- trunk/gtk-doc.make	(original)
+++ trunk/gtk-doc.make	Mon Apr 21 17:48:52 2008
@@ -38,7 +38,12 @@
 	$(DOC_MODULE).prerequisites \
 	$(DOC_MODULE).signals
 
-CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
+REPORT_FILES = \
+	$(DOC_MODULE)-undocumented.txt \
+	$(DOC_MODULE)-undeclared.txt \
+	$(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
 
 if ENABLE_GTK_DOC
 all-local: html-build.stamp
@@ -100,11 +105,11 @@
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building HTML'
 	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html 
+	rm -rf $(srcdir)/html
 	mkdir $(srcdir)/html
 	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo 'gtk-doc: Fixing cross-references' 
+	@echo 'gtk-doc: Fixing cross-references'
 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	touch html-build.stamp
 
@@ -114,8 +119,13 @@
 	rm -f *~ *.bak
 	rm -rf .libs
 
+distclean-local:
+	cd $(srcdir) && \
+	  rm -rf xml $(REPORT_FILES) \
+	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
 maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+	cd $(srcdir) && rm -rf xml html
 
 install-data-local:
 	installfiles=`echo $(srcdir)/html/*`; \
@@ -129,7 +139,10 @@
 	  done; \
 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+	  (which gtkdoc-rebase >& /dev/null && \
+            gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || : ; \
 	fi
+	
 
 uninstall-local:
 	rm -f $(DESTDIR)$(TARGET_DIR)/*
@@ -152,8 +165,9 @@
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
 	cp $(srcdir)/html/* $(distdir)/html
-	if test -f $(srcdir)/$(DOC_MODULE).types; then \
-	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
-	fi
+	cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+	cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	cd $(distdir) && rm -f $(DISTCLEANFILES)
+	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Mon Apr 21 17:48:52 2008
@@ -3,7 +3,7 @@
 [encoding: UTF-8]
 data/polkit-gnome-authorization.desktop.in
 examples/polkit-gnome-example.c
-examples/polkit-gnome-example.policy.in
+examples/org.gnome.policykit.examples.policy.in
 polkit-gnome/polkit-gnome-action.c
 polkit-gnome/polkit-gnome-auth.c
 polkit-gnome/polkit-gnome-context.c