- Adding correct files for building

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14236 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/pbconf/trunk/gosa-trunk.pb b/pbconf/trunk/gosa-trunk.pb
deleted file mode 100644 (file)
index 4f9e627..0000000
--- a/pbconf/trunk/gosa-trunk.pb
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# Project Builder configuration file
-# For project gosa-trunk
-#
-# $Id$
-#
-
-#
-# What is the project URL
-#
-#pburl gosa-trunk = svn://svn.gosa-trunk.org/gosa-trunk/devel
-#pburl gosa-trunk = svn://svn+ssh.gosa-trunk.org/gosa-trunk/devel
-pburl gosa-trunk = https://oss.gonicus.de/repositories/gosa-contrib/gosa-all
-#pburl gosa-trunk = http://www.gosa-trunk.org/src/gosa-trunk-devel.tar.gz
-#pburl gosa-trunk = ftp://ftp.gosa-trunk.org/src/gosa-trunk-devel.tar.gz
-#pburl gosa-trunk = file:///src/gosa-trunk-devel.tar.gz
-#pburl gosa-trunk = dir:///src/gosa-trunk-devel
-
-# Repository
-#pbrepo gosa-trunk = ftp://ftp.gosa-trunk.org
-#pbml gosa-trunk = gosa-trunk-announce@lists.gosa-trunk.org
-#pbsmtp gosa-trunk = localhost
-
-# Check whether project is well formed 
-# when downloading from ftp/http/...
-# (containing already a directory with the project-version name)
-#pbwf gosa-trunk = 1
-
-#
-# Packager label
-#
-pbpackager gosa-trunk = Benoit Mortier <benoit.mortier@opensides.be>
-#
-
-# For delivery to a machine by SSH (potentially the FTP server)
-# Needs hostname, account and directory
-#
-#sshhost gosa-trunk = www.gosa-trunk.org
-#sshlogin gosa-trunk = bill
-#sshdir gosa-trunk = /gosa-trunk/ftp
-#sshport gosa-trunk = 22
-
-#
-# For Virtual machines management
-# Naming convention to follow: distribution name (as per ProjectBuilder::Distribution)
-# followed by '-' and by release number
-# followed by '-' and by architecture
-# a .vmtype extension will be added to the resulting string
-# a QEMU rhel-3-i286 here means that the VM will be named rhel-3-i386.qemu
-#
-#vmlist gosa-trunk = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,fedora-7-i386,fedora-8-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,fedora-6-x86_64,fedora-7-x86_64,fedora-8-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64
-
-#
-# Valid values for vmtype are
-# qemu, (vmware, xen, ... TBD)
-#vmtype gosa-trunk = qemu
-
-# Hash for VM stuff on vmtype
-#vmntp default = pool.ntp.org
-
-# We suppose we can commmunicate with the VM through SSH
-#vmhost gosa-trunk = localhost
-#vmlogin gosa-trunk = pb
-#vmport gosa-trunk = 2222
-
-# Timeout to wait when VM is launched/stopped
-#vmtmout default = 120
-
-# per VMs needed paramaters
-#vmopt gosa-trunk = -m 384 -daemonize
-#vmpath gosa-trunk = /home/qemu
-#vmsize gosa-trunk = 5G
-
-# 
-# For Virtual environment management
-# Naming convention to follow: distribution name (as per ProjectBuilder::Distribution)
-# followed by '-' and by release number
-# followed by '-' and by architecture
-# a .vetype extension will be added to the resulting string
-# a chroot rhel-3-i286 here means that the VE will be named rhel-3-i386.chroot
-#
-#velist gosa-trunk = fedora-7-i386
-
-# VE params
-#vetype gosa-trunk = chroot
-#ventp default = pool.ntp.org
-#velogin gosa-trunk = pb
-#vepath gosa-trunk = /var/lib/mock
-#veconf gosa-trunk = /etc/mock
-#verebuild gosa-trunk = false
-
-#
-# Global version/tag for the project
-#
-#projver gosa-trunk = devel
-#projtag gosa-trunk = 1
-
-# Hash of valid version names
-
-# Additional repository to add at build time
-# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/5/pb.repo
-# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/5/pb.repo
-#version gosa-trunk = devel,stable
-
-# Is it a test version or a production version
-testver gosa-trunk = true
-
-# Additional repository to add at build time
-# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/5/pb.repo
-# addrepo centos-4-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el4.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/4/pb.repo
-
-# Adapt to your needs:
-# Optional if you need to overwrite the global values above
-#
-#pkgver gosa-trunk = stable
-#pkgtag gosa-trunk = 3
-# Hash of default package/package directory
-defpkgdir gosa-trunk = gosa-all
-# Hash of additional package/package directory
-#extpkgdir minor-pkg = dir-minor-pkg
-
-# List of files per pkg on which to apply filters
-# Files are mentioned relatively to pbroot/defpkgdir
-#filteredfiles gosa-trunk = Makefile.PL,configure.in,install.sh,gosa-trunk.8
-#supfiles gosa-trunk = gosa-trunk.init
-
-# For perl modules, names are different depending on distro
-# Here perl-xxx for RPMs, libxxx-perl for debs, ...
-# So the package name is indeed virtual
-#namingtype gosa-trunk = perl

diff --git a/pbconf/trunk/gosa-trunk/deb/changelog b/pbconf/trunk/gosa-trunk/deb/changelog
deleted file mode 100644 (file)
index 9320d95..0000000
--- a/pbconf/trunk/gosa-trunk/deb/changelog
+++ /dev/null
@@ -1 +0,0 @@
-PBLOG

diff --git a/pbconf/trunk/gosa-trunk/deb/compat b/pbconf/trunk/gosa-trunk/deb/compat
deleted file mode 100644 (file)
index b8626c4..0000000
--- a/pbconf/trunk/gosa-trunk/deb/compat
+++ /dev/null
@@ -1 +0,0 @@
-4

diff --git a/pbconf/trunk/gosa-trunk/deb/control b/pbconf/trunk/gosa-trunk/deb/control
deleted file mode 100644 (file)
index 86adb9a..0000000
--- a/pbconf/trunk/gosa-trunk/deb/control
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: PBPKG
-Section: PBGRP
-Priority: optional
-Maintainer: PBPACKAGER
-Build-Depends: debhelper (>= 4.2.20), PBDEP
-Standards-Version: 3.6.1
-
-Package: PBPKG
-Architecture: amd64 i386 ia64
-Section: PBGRP
-Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, PBDEP
-Recommends: PBREC
-Suggests: PBSUG
-Description: 
- PBDESC
- .
- Homepage: PBURL
-

diff --git a/pbconf/trunk/gosa-trunk/deb/copyright b/pbconf/trunk/gosa-trunk/deb/copyright
deleted file mode 100644 (file)
index ab672db..0000000
--- a/pbconf/trunk/gosa-trunk/deb/copyright
+++ /dev/null
@@ -1,27 +0,0 @@
-This package is debianized by PBPACKAGER
-`date`
-
-The current upstream source was downloaded from
-PBREPO.
-
-Upstream Authors: Put their name here
-
-Copyright:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA 02110-1301, USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in /usr/share/common-licenses/GPL.
-

diff --git a/pbconf/trunk/gosa-trunk/deb/gosa-trunk.dirs b/pbconf/trunk/gosa-trunk/deb/gosa-trunk.dirs
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/pbconf/trunk/gosa-trunk/deb/gosa-trunk.docs b/pbconf/trunk/gosa-trunk/deb/gosa-trunk.docs
deleted file mode 100644 (file)
index 2db6539..0000000
--- a/pbconf/trunk/gosa-trunk/deb/gosa-trunk.docs
+++ /dev/null
@@ -1,5 +0,0 @@
-INSTALL
-COPYING
-AUTHORS
-NEWS
-README

diff --git a/pbconf/trunk/gosa-trunk/deb/rules b/pbconf/trunk/gosa-trunk/deb/rules
deleted file mode 100644 (file)
index ec0ab7a..0000000
--- a/pbconf/trunk/gosa-trunk/deb/rules
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# $Id$
-#
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Define package name variable for a one-stop change.
-PACKAGE_NAME = PBPKG
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-        INSTALL_PROGRAM += -s
-endif
-config.status: configure
-        dh_testdir
-
-        # Configure the package.
-        CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
- --mandir=\$${prefix}/share/man
-
-# Build both architecture dependent and independent
-build: build-arch build-indep
-
-# Build architecture dependent
-build-arch: build-arch-stamp
-
-build-arch-stamp:  config.status
-        dh_testdir
-
-        # Compile the package.
-        $(MAKE)
-
-        touch build-stamp
-
-# Build architecture independent
-build-indep: build-indep-stamp
-
-build-indep-stamp:  config.status
-        # Nothing to do, the only indep item is the manual which is available as html in original source
-        touch build-indep-stamp
-
-# Clean up
-clean:
-        dh_testdir
-        dh_testroot
-        rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
-        # Clean temporary document directory
-        rm -rf debian/doc-temp
-        # Clean up.
-        -$(MAKE) distclean
-        rm -f config.log
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-        cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-        cp -f /usr/share/misc/config.guess config.guess
-endif
-
-        dh_clean
-
-# Install architecture dependent and independent
-install: install-arch install-indep
-
-# Install architecture dependent
-install-arch: build-arch
-        dh_testdir
-        dh_testroot
-        dh_clean -k -s
-        dh_installdirs -s
-
-        # Install the package files into build directory:
-        # - start with upstream make install
-        $(MAKE) install prefix=$(CURDIR)/debian/$(PACKAGE_NAME)/usr mandir=$(CURDIR)/debian/$(PACKAGE_NAME)/us
-r/share/man
-        # - copy html manual to temporary location for renaming
-        mkdir -p debian/doc-temp
-        dh_install -s
-
-# Install architecture independent
-install-indep: build-indep
-        dh_testdir
-        dh_testroot
-        dh_clean -k -i
-        dh_installdirs -i
-        dh_install -i
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-        dh_testdir
-        dh_testroot
-        dh_installchangelogs ChangeLog
-        dh_installdocs
-        dh_installman
-        dh_link
-        dh_strip
-        dh_compress
-        dh_fixperms
-        dh_installdeb
-        dh_shlibdeps
-        dh_gencontrol
-        dh_md5sums
-        dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-        $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-        $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-# Build architecture depdendent and independent packages
-binary: binary-arch binary-indep
-.PHONY: clean binary
-

diff --git a/pbconf/trunk/gosa-trunk/rpm/gosa-trunk.spec b/pbconf/trunk/gosa-trunk/rpm/gosa-trunk.spec
deleted file mode 100644 (file)
index 0108c4f..0000000
--- a/pbconf/trunk/gosa-trunk/rpm/gosa-trunk.spec
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# $Id$
-#
-# Used if virtual name != real name (perl, ...)
-#%define srcname       PBPKG
-
-Summary:        bla-bla
-Summary(fr):    french bla-bla
-
-Name:           PBREALPKG
-Version:        PBVER
-Release:        PBTAGPBSUF
-License:        PBLIC
-Group:          PBGRP
-Url:            PBURL
-Source:         PBREPO/PBSRC
-#PBPATCHSRC
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-#Requires:       PBDEP
-
-%description
-PBDESC
-
-%description -l fr
-french desc
-
-%prep
-%setup -q
-# Used if virtual name != real name (perl, ...)
-#%setup -q -n %{srcname}-%{version}
-#PBPATCHCMD
-
-%build
-%configure
-make %{?_smp_mflags}
-
-%install
-%{__rm} -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%doc ChangeLog
-%doc INSTALL COPYING README AUTHORS NEWS
-
-%changelog
-PBLOG
-

diff --git a/pbconf/trunk/gosa.pb b/pbconf/trunk/gosa.pb
new file mode 100644 (file)
index 0000000..04efe8d
--- /dev/null
+++ b/pbconf/trunk/gosa.pb
@@ -0,0 +1,130 @@
+#
+# Project Builder configuration file
+# For project gosa
+#
+# $Id$
+#
+
+#
+# What is the project URL
+#
+#pburl gosa = svn://svn.gosa.org/gosa/devel
+#pburl gosa = svn://svn+ssh.gosa.org/gosa/devel
+pburl gosa = https://oss.gonicus.de/repositories/gosa/trunk
+#pburl gosa = http://www.gosa.org/src/gosa-devel.tar.gz
+#pburl gosa = ftp://ftp.gosa.org/src/gosa-devel.tar.gz
+#pburl gosa = file:///src/gosa-devel.tar.gz
+#pburl gosa = dir:///src/gosa-devel
+
+# Repository
+pbrepo gosa = ftp://gosa-addons.org
+#pbml gosa = gosa-announce@lists.gosa.org
+#pbsmtp gosa = localhost
+
+# Check whether project is well formed 
+# when downloading from ftp/http/...
+# (containing already a directory with the project-version name)
+#pbwf gosa = 1
+
+#
+# Packager label
+#
+pbpackager gosa = Benoit Mortier <benoit.mortier@opensides.be>
+#
+
+# For delivery to a machine by SSH (potentially the FTP server)
+# Needs hostname, account and directory
+#
+#sshhost gosa = www.gosa.org
+#sshlogin gosa = bill
+#sshdir gosa = /gosa/ftp
+#sshport gosa = 22
+
+#
+# For Virtual machines management
+# Naming convention to follow: distribution name (as per ProjectBuilder::Distribution)
+# followed by '-' and by release number
+# followed by '-' and by architecture
+# a .vmtype extension will be added to the resulting string
+# a QEMU rhel-3-i286 here means that the VM will be named rhel-3-i386.qemu
+#
+#vmlist gosa = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,fedora-7-i386,fedora-8-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,fedora-6-x86_64,fedora-7-x86_64,fedora-8-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64
+
+#
+# Valid values for vmtype are
+# qemu, (vmware, xen, ... TBD)
+#vmtype gosa = qemu
+
+# Hash for VM stuff on vmtype
+#vmntp default = pool.ntp.org
+
+# We suppose we can commmunicate with the VM through SSH
+#vmhost gosa = localhost
+#vmlogin gosa = pb
+#vmport gosa = 2222
+
+# Timeout to wait when VM is launched/stopped
+#vmtmout default = 120
+
+# per VMs needed paramaters
+#vmopt gosa = -m 384 -daemonize
+#vmpath gosa = /home/qemu
+#vmsize gosa = 5G
+
+# 
+# For Virtual environment management
+# Naming convention to follow: distribution name (as per ProjectBuilder::Distribution)
+# followed by '-' and by release number
+# followed by '-' and by architecture
+# a .vetype extension will be added to the resulting string
+# a chroot rhel-3-i286 here means that the VE will be named rhel-3-i386.chroot
+#
+#velist gosa = fedora-7-i386
+
+# VE params
+#vetype gosa = chroot
+#ventp default = pool.ntp.org
+#velogin gosa = pb
+#vepath gosa = /var/lib/mock
+#veconf gosa = /etc/mock
+#verebuild gosa = false
+
+#
+# Global version/tag for the project
+#
+projver gosa = trunk
+projtag gosa = 1
+
+# Hash of valid version names
+
+# Additional repository to add at build time
+# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/5/pb.repo
+# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/5/pb.repo
+#version gosa = devel,stable
+
+# Is it a test version or a production version
+testver gosa = true
+
+# Additional repository to add at build time
+# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/5/pb.repo
+# addrepo centos-4-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el4.rf.x86_64.rpm,ftp://ftp.project-builder.org/test/centos/4/pb.repo
+
+# Adapt to your needs:
+# Optional if you need to overwrite the global values above
+#
+#pkgver gosa = stable
+#pkgtag gosa = 3
+# Hash of default package/package directory
+defpkgdir gosa = gosa-all
+# Hash of additional package/package directory
+#extpkgdir minor-pkg = dir-minor-pkg
+
+# List of files per pkg on which to apply filters
+# Files are mentioned relatively to pbroot/defpkgdir
+#filteredfiles gosa = Makefile.PL,configure.in,install.sh,gosa.8
+#supfiles gosa = gosa.init
+
+# For perl modules, names are different depending on distro
+# Here perl-xxx for RPMs, libxxx-perl for debs, ...
+# So the package name is indeed virtual
+#namingtype gosa = perl