SVN commit 557194 by woebbe:
- create libicecc-dev package for icemon
- simplified debian files?!?
M +9 -1 changelog
M +1 -1 compat
M +16 -2 control
M +4 -6 icecc.install
A icecc.links
M +6 -6 icecc.templates
A libicecc-dev.install
A patches/library-name.diff
A patches/pkgconfig-name.diff
M +13 -76 rules
--- trunk/icecream/debian/changelog #557193:557194
@@ -1,3 +1,11 @@
+icecc (0.7.3-3) unstable; urgency=low
+
+ * Create libicecc-dev package.
+
+ * Simplified debian files.
+
+ -- Andre Woebbeking <[EMAIL PROTECTED]> Sun, 02 Jun 2006 19:00:51 +0200
+
icecc (0.7.3-2) unstable; urgency=low
* Made icecc --build-native work.
@@ -8,7 +16,7 @@
* New upstream version with new protocol (changed in 0.7.0).
- /usr/bin/create-env is now /usr/lib/icecc/icecc-create-env
+ * /usr/bin/create-env is now /usr/lib/icecc/icecc-create-env
-- Andre Woebbeking <[EMAIL PROTECTED]> Sat, 01 Jun 2006 20:36:15 +0200
--- trunk/icecream/debian/compat #557193:557194
@@ -1 +1 @@
-4
+5
--- trunk/icecream/debian/control #557193:557194
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Andre Woebbeking <[EMAIL PROTECTED]>
Uploaders:
-Build-Depends: automake1.7, debhelper (>> 4.0.0), kdelibs4-dev (>= 4:3.5.0)
+Build-Depends: automake1.9, debhelper (>> 5.0.0)
Standards-Version: 3.6.1.0
Package: icecc
Architecture: any
Section: devel
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, adduser, debconf
Suggests: icecc-monitor
Description: Simple distributed compiler client and server
icecc is a program to distribute compilation of C or C++ code across
@@ -20,3 +20,17 @@
the same libraries or header files installed.
.
This package is part of the KDE Software Development Kit.
+
+Package: libicecc-dev
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Description: Simple distributed compiler client and server
+ icecc is a program to distribute compilation of C or C++ code across
+ several machines on a network. icecc should always generate the same
+ results as a local compile, is simple to install and use, and is often
+ significantly faster than a local compile. icecc does not require all
+ machines to share a filesystem, have synchronized clocks, or to have
+ the same libraries or header files installed.
+ .
+ This package provides files which are necessary to build icecc-monitor.
--- trunk/icecream/debian/icecc.install #557193:557194
@@ -1,6 +1,4 @@
-debian/tmp/usr/bin/icecc
-debian/tmp/usr/lib/icecc/bin/g++
-debian/tmp/usr/lib/icecc/bin/gcc
-debian/tmp/usr/lib/icecc/icecc-create-env
-debian/tmp/usr/sbin/icecc-scheduler
-debian/tmp/usr/sbin/iceccd
+usr/bin/icecc
+usr/lib/icecc/icecc-create-env
+usr/sbin/icecc-scheduler
+usr/sbin/iceccd
--- trunk/icecream/debian/icecc.templates #557193:557194
@@ -5,9 +5,9 @@
icecc can be run as a daemon, listening for incoming connections.
.
You have the option of starting the icecc daemon automatically on the
- computer startup. If in doubt, I suggest you not to start automatically it
- on startup. If you later change your mind, you can run: 'dpkg-reconfigure
- icecc'.
+ computer startup. You need a running daemon on every computer which should
+ be part of the compile farm. If you later change your mind, you can run:
+ 'dpkg-reconfigure icecc'.
Template: icecc/scheduler
Type: boolean
@@ -16,6 +16,6 @@
scheduler can be run as a daemon, listening for incoming connections.
.
You have the option of starting the icecc scheduler automatically on the
- computer startup. If in doubt, I suggest you not to start automatically it
- on startup. If you later change your mind, you can run: 'dpkg-reconfigure
- icecc'.
+ computer startup. You need one scheduler in your compile farm. If in doubt,
+ you should not start it automatically on startup. If you later change your
+ mind, you can run: 'dpkg-reconfigure icecc'.
--- trunk/icecream/debian/rules #557193:557194
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
-# -*- makefile -*-
# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# This file is public domain software, originally written by Joey Hess.
#
# Modified to make a template file for a multi-binary package with separated
# build-arch and build-indep targets by Bill Allombert 2001
@@ -9,27 +8,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+objdir = $(CURDIR)/obj
-# 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
-
-objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-
-include debian/debiandirs
debian/debiandirs:
@@ -59,7 +39,7 @@
touch patch-stamp ;\
fi
- $(MAKE) -f Makefile.cvs ;\
+ $(MAKE) -f Makefile.cvs
# ensure configure is executable
chmod +x configure
@@ -74,7 +54,7 @@
touch configure-stamp
#Architecture
-build: build-arch build-indep
+build: build-arch
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
@@ -90,18 +70,6 @@
touch build-arch-stamp
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
- dh_testdir
-
- #cd $(objdir) && \
- #$(MAKE)
-
- #cd $(objdir) && \
- #$(MAKE) apidox
-
- touch build-indep-stamp
-
debian-clean:
dh_testdir
dh_testroot
@@ -111,7 +79,7 @@
clean:
dh_testdir
dh_testroot
- rm -f build-arch-stamp build-indep-stamp configure-stamp \
+ rm -f build-arch-stamp configure-stamp \
debian/debiandirs debian/man/*.1
# Remove Debian specific patches
@@ -142,47 +110,24 @@
dh_clean
-install: install-arch install-indep
-
-install-arch:
+install: build
dh_testdir
dh_testroot
- dh_clean -k -s
- dh_installdirs -s
+ dh_clean -k
+ dh_installdirs
cd $(objdir) && \
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- mkdir -p $(CURDIR)/debian/tmp/usr/lib/icecc/bin
- ln -s /usr/bin/icecc $(CURDIR)/debian/tmp/usr/lib/icecc/bin/cc
- ln -s /usr/bin/icecc $(CURDIR)/debian/tmp/usr/lib/icecc/bin/c++
- ln -s /usr/bin/icecc $(CURDIR)/debian/tmp/usr/lib/icecc/bin/gcc
- ln -s /usr/bin/icecc $(CURDIR)/debian/tmp/usr/lib/icecc/bin/g++
-
(cd $(CURDIR)/debian/tmp/usr/sbin ; mv scheduler icecc-scheduler)
+ (cd $(CURDIR)/debian/tmp/usr/lib/pkgconfig ; mv icecream.pc icecc.pc)
- dh_install -s
+ dh_install --sourcedir=debian/tmp
-install-indep:
+# Build architecture-dependent files here.
+binary-arch: build-arch install
dh_testdir
dh_testroot
- dh_clean -k -i
- dh_installdirs -i
-
- #cd $(objdir) && \
- #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- #cd $(objdir) && \
- #$(MAKE) install-apidox DESTDIR=$(CURDIR)/debian/tmp
-
- #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
dh_installdocs
# dh_installexamples
@@ -209,13 +154,5 @@
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=-s binary-common
-
binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install install-indep
install-arch configure
+.PHONY: build clean binary-arch binary install configure
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
