2006-07-04 Jonathon Jongsma <jonathon.jongsma@gmail.com>

	* Makefile.am: add ability to do snapshot releases to the
	cairographics.org/snapshots/ directory in addition to official releases
	* configure.in: bumped the revision to 1.1.10 in preparation for a snapshot
	release of the 1.2 API
	* docs/reference/Makefile.am: fixed some distcheck errors

4 files changed, 24 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index bca7e3f..6a9e298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-07-04  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
 
+	* Makefile.am: add ability to do snapshot releases to the
+	cairographics.org/snapshots/ directory in addition to official releases
+	* configure.in: bumped the revision to 1.1.10 in preparation for a snapshot
+	release of the 1.2 API
+	* docs/reference/Makefile.am: fixed some distcheck errors
+
+2006-07-04  Jonathon Jongsma  <jonathon.jongsma@gmail.com>
+
 	* .cvsignore, cairomm/.cvsignore: ignore some autotools files and *.swp
 	files (from vim)
 
diff --git a/Makefile.am b/Makefile.am
index ec3eb26..4d8a94c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,10 +18,11 @@ pkgconfig_DATA = cairomm-1.0.pc
 #		make release-check
 # or		make release-publish
 
+RELEASE_OR_SNAPSHOT = `if [ "$(GENERIC_MINOR_VERSION)" = $$(echo "$(GENERIC_MINOR_VERSION)/2*2" | bc) ]; then echo release; else echo snapshot; fi`
 RELEASE_UPLOAD_HOST =   cairographics.org
 RELEASE_UPLOAD_BASE =	/srv/cairo.freedesktop.org/www
-RELEASE_UPLOAD_DIR =	$(RELEASE_UPLOAD_BASE)/releases
-RELEASE_URL_BASE = 	http://cairographics.org/releases
+RELEASE_UPLOAD_DIR =	$(RELEASE_UPLOAD_BASE)/$(RELEASE_OR_SNAPSHOT)s
+RELEASE_URL_BASE = 	http://cairographics.org/$(RELEASE_OR_SNAPSHOT)s
 RELEASE_ANNOUNCE_LIST = cairo-announce@cairographics.org (and CC gnome-announce-list@gnome.org)
 CVS = cvs
 
@@ -40,8 +41,6 @@ $(gpg_file): $(sha1_file)
 	@echo "Please enter your GPG password to sign the checksum."
 	gpg --armor --sign $^ 
 
-
-
 release-verify-even-micro:
 	@echo -n "Checking that $(VERSION) has an even micro component..."
 	@test "$(GENERIC_MICRO_VERSION)" = "`echo $(GENERIC_MICRO_VERSION)/2*2 | bc`" \
@@ -78,15 +77,15 @@ release-upload: release-check $(tar_file) $(sha1_file) $(gpg_file)
 	ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_file) $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
 	$(CVS) tag RELEASE_$(GENERIC_MAJOR_VERSION)_$(GENERIC_MINOR_VERSION)_$(GENERIC_MICRO_VERSION)
 
-release-publish: release-upload releases/$(sha1_file)
+release-publish: 
 	@echo ""
 	@echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)"
 	@echo "including the following:"
 	@echo ""
-	@echo "Subject: $(PACKAGE) release $(VERSION) now available"
+	@echo "Subject: $(PACKAGE) $(RELEASE_OR_SNAPSHOT) $(VERSION) now available"
 	@echo ""
 	@echo "============================== CUT HERE =============================="
-	@echo "A new $(PACKAGE) release $(VERSION) is now available from:"
+	@echo "A new $(PACKAGE) $(RELEASE_OR_SNAPSHOT) $(VERSION) is now available from:"
 	@echo ""
 	@echo "	$(RELEASE_URL_BASE)/$(tar_file)"
 	@echo ""
@@ -100,7 +99,7 @@ release-publish: release-upload releases/$(sha1_file)
 	@echo "	(signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
 	@echo ""
 	@echo "cairomm is a C++ API for the cairo graphics library.  For more "
-	@echo "information, see http://cairographics.org"
+	@echo "information, see http://cairographics.org/cairomm"
 	@echo ""
 	@echo "============================== CUT HERE =============================="
 	@echo "Also, please include the new entries from the NEWS file."
diff --git a/configure.in b/configure.in
index 53473a2..c18e923 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 AC_INIT(cairomm/cairomm.h)
 
 #release versioning
-GENERIC_MAJOR_VERSION=0
-GENERIC_MINOR_VERSION=7
-GENERIC_MICRO_VERSION=0
+GENERIC_MAJOR_VERSION=1
+GENERIC_MINOR_VERSION=1
+GENERIC_MICRO_VERSION=10
 GENERIC_VERSION=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION.$GENERIC_MICRO_VERSION
 AC_SUBST(GENERIC_MAJOR_VERSION)
 AC_SUBST(GENERIC_MINOR_VERSION)
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 416df77..9bf14f3 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -5,7 +5,7 @@ WEB_SERVER_PATH = /srv/cairo.freedesktop.org/www/documentation/cairomm/reference
 HTML_TEMPLATE_FILES = cairomm.css cairomm-header.html
 
 EXTRA_DIST = $(DOXYGEN_CONFIGFILE_SOURCE) \
-			 introduction.h $(HTML_TEMPLATE_FILES) cairomm_doxygen_tags \
+			 $(HTML_TEMPLATE_FILES) cairomm_doxygen_tags \
 			 html
 
 index_html = html/index.html
@@ -28,7 +28,7 @@ publish:	html
 install-reference: $(index_html)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(referencedir)
-	@dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.jpg $$dir/*.map $$dir/*.md5 $$dir/*.dot ; do \
+	@dir='$(<D)'; for p in `ls $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.jpg $$dir/*.map $$dir/*.md5 $$dir/*.dot` ; do \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(referencedir)/$$f"; \
 	  $(INSTALL_DATA) $$p $(DESTDIR)$(referencedir)/$$f; \
@@ -42,12 +42,12 @@ uninstall-reference: $(index_html)
 	  rm -f $(DESTDIR)$(referencedir)/$$f; \
 	done
 
+DOXYGEN_REPORTS = doxygen-output.txt doxygen-warnings.txt undocumented.txt
+
 doc-clean:
 	-rm -rf html
 	-rm -f cairomm_doxygen_tags
-	-rm -f doxygen-output.txt
-	-rm -f doxygen-warnings.txt
-	-rm -f undocumented.txt
+	-rm -f $(DOXYGEN_REPORTS)
 
 install-data-local: install-reference
 
@@ -57,7 +57,7 @@ all-local: $(index_html)
 
 maintainer-clean-local: doc-clean
 
-DISTCLEANFILES = $(DOXYGEN_CONFIGFILE)
+DISTCLEANFILES = $(DOXYGEN_CONFIGFILE) $(DOXYGEN_REPORTS)
 
 .PHONY: doc-clean install-reference uninstall-reference