One more update of debian packaging due to major version bump, add distclean target.

diff --git a/org.gridsite.core/project/debian.control b/org.gridsite.core/project/debian.control
index 3ce4d37..03ba34d 100644 (file)
--- a/org.gridsite.core/project/debian.control
+++ b/org.gridsite.core/project/debian.control
@@ -26,7 +26,7 @@ Depends: \${shlibs:Depends}, \${misc:Depends}
 Description: GridSite mod_gridsite module and CGI binaries for Apache httpd
  GridSite Apache module and CGI binaries.
 
-Package: libgridsite${MINOR_VERSION}
+Package: libgridsite2
 Section: libs
 Architecture: any
 Depends: \${shlibs:Depends}, \${misc:Depends}, libssl-dev
@@ -39,7 +39,7 @@ Description: GridSite libraries and documentation
 Package: libgridsite-dev
 Section: libdevel
 Architecture: any
-Depends: libgridsite${MINOR_VERSION} (= \${binary:Version}),
+Depends: libgridsite2 (= \${binary:Version}),
          \${misc:Depends}
 Description: GridSite static libraries and headers
  Development files for GridSite - .a libraries and .h headers.

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index a426c20..9db906e 100644 (file)
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -422,6 +422,9 @@ clean:
        rm -vf gsexec urlencode htcp htcp-static findproxyfile showx509exts slashgrid fuse-test gaclexample xacmlexample htproxyput gsoap-test
        rm -vf gridsite-openssl.pc gridsite-globus.pc
 
+distclean:
+       rm -rfv ../dist ../debian ../gridsite-*.tar.gz $(MYRPMDIR)
+
 #
 # Install
 #
@@ -615,4 +618,4 @@ wtf:
 #      ls -lR /usr/local/
 #      ls -lR $(GSOAPDIR)
 
-.PHONY: build build-lib apidoc clean install install-lib install-slashgrid install-ws dist htcp-bin rpm deb wtf post-install-debian
+.PHONY: build build-lib apidoc clean distclean install install-lib install-slashgrid install-ws dist htcp-bin rpm deb wtf post-install-debian