pcp

configure.in
--- /tmp/.diff_b2q9ov 2008-02-20 15:22:24.000000000 +1100
+++ configure.in 2008-02-20 15:21:30.000000000 +1100
@@ -127,6 +127,11 @@ if test -z "$PACKAGE_BUILD_DATE" ; then
fi
AC_SUBST(PACKAGE_BUILD_DATE)

+if test -z "$PACKAGE_DISTRIBUTION" ; then

• PACKAGE_DISTRIBUTION=None +fi +AC_SUBST(PACKAGE_DISTRIBUTION) + if test -z "$PACKAGE_BUILDER" then case "$target_os" debian/GNUmakefile --- /tmp/.diff_gjXV9Z 2008-02-20 15:22:24.000000000 +1100 +++ debian/GNUmakefile 2008-02-20 14:45:12.000000000 +1100 @@ -30,7 +30,7 @@ default: include $(BUILDRULES)

install: default
-ifeq ($(PKG_DISTRIBUTION), debian)
+ifeq ($(PACKAGE_DISTRIBUTION), debian)
$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
$(INSTALL) -m 644 changelog $(PKG_DOC_DIR)/changelog.Debian
endif
@@ -40,42 +40,42 @@ default_pcp : default
install_pcp : install

install-libpcp: default
-ifeq ($(PKG_DISTRIBUTION), debian)
+ifeq ($(PACKAGE_DISTRIBUTION), debian)
$(INSTALL) -m 755 -d $(LIBPCP_DOC_DIR)
$(INSTALL) -m 644 copyright $(LIBPCP_DOC_DIR)
$(INSTALL) -m 644 changelog $(LIBPCP_DOC_DIR)/changelog.Debian
endif

install-devpcp: default
-ifeq ($(PKG_DISTRIBUTION), debian)
+ifeq ($(PACKAGE_DISTRIBUTION), debian)
$(INSTALL) -m 755 -d $(DEVPCP_DOC_DIR)
$(INSTALL) -m 644 copyright $(DEVPCP_DOC_DIR)
$(INSTALL) -m 644 changelog $(DEVPCP_DOC_DIR)/changelog.Debian
endif

install-libpmda: default
-ifeq ($(PKG_DISTRIBUTION), debian)
+ifeq ($(PACKAGE_DISTRIBUTION), debian)
$(INSTALL) -m 755 -d $(LIBPMDA_DOC_DIR)
$(INSTALL) -m 644 copyright $(LIBPMDA_DOC_DIR)
$(INSTALL) -m 644 changelog $(LIBPMDA_DOC_DIR)/changelog.Debian
endif

install-devpmda: default
-ifeq ($(PKG_DISTRIBUTION), debian)
+ifeq ($(PACKAGE_DISTRIBUTION), debian)
$(INSTALL) -m 755 -d $(DEVPMDA_DOC_DIR)
$(INSTALL) -m 644 copyright $(DEVPMDA_DOC_DIR)
$(INSTALL) -m 644 changelog $(DEVPMDA_DOC_DIR)/changelog.Debian
endif

install-libtrace: default
-ifeq ($(PKG_DISTRIBUTION), debian)
+ifeq ($(PACKAGE_DISTRIBUTION), debian)
$(INSTALL) -m 755 -d $(LIBTRACE_DOC_DIR)
$(INSTALL) -m 644 copyright $(LIBTRACE_DOC_DIR)
$(INSTALL) -m 644 changelog $(LIBTRACE_DOC_DIR)/changelog.Debian
endif

install-devtrace: default
-ifeq ($(PKG_DISTRIBUTION), debian)
+ifeq ($(PACKAGE_DISTRIBUTION), debian)
$(INSTALL) -m 755 -d $(DEVTRACE_DOC_DIR)
$(INSTALL) -m 644 copyright $(DEVTRACE_DOC_DIR)
$(INSTALL) -m 644 changelog $(DEVTRACE_DOC_DIR)/changelog.Debian
debian/control
--- /tmp/.diff_fDHbWu 2008-02-20 15:22:24.000000000 +1100
+++ debian/control 2008-02-20 08:54:38.000000000 +1100
@@ -6,7 +6,7 @@ Build-Depends: autoconf, debhelper (>= 5
Standards-Version: 3.5.9

Package: pcp
-Depends: libpcp3, libpcp-pmda3, libpcp-trace2
+Depends: libpcp3, libpcp-pmda3, libpcp-trace2, sysv-rc-conf
Architecture: any
Description: System-level performance monitoring and performance management.
Performance Co-Pilot (PCP) is a framework and services to
debian/rules
--- /tmp/.diff_2U2WJZ 2008-02-20 15:22:24.000000000 +1100
+++ debian/rules 2008-02-20 14:44:33.000000000 +1100
@@ -18,15 +18,16 @@ dirlibpcp_tracedev = debian/$(libpcp_tra
alldir = $(dirpcp) $(dirlibpcp) $(dirlibpcpdev) $(dirlibpcp_pmda) \
$(dirlibpcp_pmdadev) $(dirlibpcp_trace) $(dirlibpcp_tracedev)

-pkgpcp = DIST_ROOT=pwd/$(dirpcp); export DIST_ROOT;
-pkglibpcp = DIST_ROOT=pwd/$(dirlibpcp); export DIST_ROOT;
-pkglibpcp_pmda = DIST_ROOT=pwd/$(dirlibpcp_pmda); export DIST_ROOT;
-pkglibpcp_trace = DIST_ROOT=pwd/$(dirlibpcp_trace); export DIST_ROOT;
+zip = @export GZIP=-9q
+pkgpcp = $(zip); export DIST_ROOT=pwd/$(dirpcp);
+pkglibpcp = $(zip); export DIST_ROOT=pwd/$(dirlibpcp);
+pkglibpcp_pmda = $(zip); export DIST_ROOT=pwd/$(dirlibpcp_pmda);
+pkglibpcp_trace = $(zip); export DIST_ROOT=pwd/$(dirlibpcp_trace);

-stdenv = @GZIP=-q; export GZIP;
-options = export DEBUG=-DNDEBUG DISTRIBUTION=debian ;
+options = export DEBUG=-DNDEBUG PACKAGE_DISTRIBUTION=debian ;
checkdir = test -f debian/rules
checkver = rm -f debian/compat && echo 5 > debian/compat
+uninstall = cat debian/*.install | sed -e "s,^{,debian/$(pcp)/,"} | xargs rm -f

build: built
built: config
@@ -65,6 +66,7 @@ binary-arch: checkroot built
dh_compress
dh_fixperms
dh_install --sourcedir=debian/$(pcp)

• $(uninstall) dh_makeshlibs -N $(libpcp) dh_makeshlibs -p $(libpcp) dh_makeshlibs -N $(libpcp_pmda) src/libpcp/src/GNUmakefile --- /tmp/.diff_h84bzu 2008-02-20 15:22:24.000000000 +1100 +++ src/libpcp/src/GNUmakefile 2008-02-20 15:09:15.000000000 +1100 @@ -53,10 +53,13 @@ LCFLAGS += '-DCPP_SIMPLE="$(CPP_SIMPLE)"

DSOVERSION = 3
LIBTARGET = libpcp.$(DSOSUFFIX).$(DSOVERSION)
-SYMTARGET = libpcp.$(DSOSUFFIX) libpcp.$(DSOSUFFIX).2
+SYMTARGET = libpcp.$(DSOSUFFIX)
+ifneq "$(PACKAGE_DISTRIBUTION)" "debian"
+SYMTARGET += libpcp.$(DSOSUFFIX).2
+endif
ifeq "$(TARGET_OS)" "darwin"
LIBTARGET = libpcp.$(DSOVERSION).$(DSOSUFFIX)
-SYMTARGET = libpcp.$(DSOSUFFIX) libpcp.2.$(DSOSUFFIX)
+SYMTARGET = libpcp.$(DSOSUFFIX)
endif
ifeq "$(TARGET_OS)" "cygwin"
LIBTARGET = libpcp.$(DSOSUFFIX)
src/libpcp_pmda/src/GNUmakefile
--- /tmp/.diff_CMXOpZ 2008-02-20 15:22:24.000000000 +1100
+++ src/libpcp_pmda/src/GNUmakefile 2008-02-20 15:19:03.000000000 +1100
@@ -41,6 +41,9 @@ LIBTARGET_V1 = libpcp_pmda.$(DSOSUFFIX)
LIBTARGET_V2 = libpcp_pmda.$(DSOVERSION_V2).$(DSOSUFFIX)
LIBTARGET_V3 = libpcp_pmda.$(DSOVERSION_V3).$(DSOSUFFIX)
endif
+ifeq "$(PACKAGE_DISTRIBUTION) "debian"
+LIBTARGET_V2 =
+endif
LIBTARGET = $(LIBTARGET_V3)

ifeq "$(TARGET_OS)" "cygwin"