Restructured debian packaging system: now there are two packages, a "standard"

version that includes all the default options and a "full" version that
additionally includes support for TCP wrappers and IDENT lookups.

diff --git a/Makefile.am b/Makefile.am
index 195bbe6f5d2a6d11329441194c3b4ffff9f400be..66ea2919831297e3c117850f1048323b8a07b8b4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #

-# $Id: Makefile.am,v 1.13 2003/12/31 17:20:11 alex Exp $
+# $Id: Makefile.am,v 1.14 2004/01/01 22:24:48 alex Exp $

 #
 
 AUTOMAKE_OPTIONS = gnu
 #
 
 AUTOMAKE_OPTIONS = gnu


@@ -19,7 +19,7 @@ maintainer-clean-local:
        rm -rf autom4te.cache
        rm -f Makefile.in Makefile aclocal.m4 configure
        rm -f mkinstalldirs missing depcomp install-sh
        rm -rf autom4te.cache
        rm -f Makefile.in Makefile aclocal.m4 configure
        rm -f mkinstalldirs missing depcomp install-sh

-       rm -f config.log build-stamp
+       rm -f config.log build-stamp* debian

 
 lint:
        make -C src/ngircd lint
 
 lint:
        make -C src/ngircd lint


@@ -28,6 +28,7 @@ rpm: distcheck
        rpm -ta ngircd-*.tar.gz
 
 deb:
        rpm -ta ngircd-*.tar.gz
 
 deb:

+       [ -f debian/rules ] || ln -s contrib/Debian debian

        dpkg-buildpackage -rfakeroot
 
 # -eof-
        dpkg-buildpackage -rfakeroot
 
 # -eof-

diff --git a/contrib/Debian/Makefile.am b/contrib/Debian/Makefile.am
index 3b7af3864307a915d76320fdf442f062040b6b7d..d071aa502904e4bab63ecb4d4bf70d305604ea51 100644 (file)
--- a/contrib/Debian/Makefile.am
+++ b/contrib/Debian/Makefile.am
@@ -8,7 +8,7 @@
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #
 # (at your option) any later version.
 # Please read the file COPYING, README and AUTHORS for more information.
 #

-# $Id: Makefile.am,v 1.1 2003/12/31 17:20:11 alex Exp $
+# $Id: Makefile.am,v 1.2 2004/01/01 22:24:48 alex Exp $

 #
 
 EXTRA_DIST = rules changelog compat control copyright \
 #
 
 EXTRA_DIST = rules changelog compat control copyright \


@@ -18,7 +18,7 @@ maintainer-clean-local:
        rm -f Makefile Makefile.in
        rm -f ngircd.postinst.debhelper ngircd.postrm.debhelper \
         ngircd.prerm.debhelper ngircd.substvars
        rm -f Makefile Makefile.in
        rm -f ngircd.postinst.debhelper ngircd.postrm.debhelper \
         ngircd.prerm.debhelper ngircd.substvars

+       rm -rf ngircd ngircd-full

        rm -f files
        rm -f files

-       rm -rf ngircd

 
 # -eof-
 
 # -eof-

diff --git a/contrib/Debian/changelog b/contrib/Debian/changelog
index 70f201c2ad69f7b6c2ce5b3516fb82db35f24a68..4f8885d54a4ac3cbbfccace8243f5229be332173 100644 (file)
--- a/contrib/Debian/changelog
+++ b/contrib/Debian/changelog
@@ -1,3 +1,13 @@
+ngircd (0.7.6+HEAD-0ab1) unstable; urgency=low
+
+  * Included all changes from the CVS-HEAD upstream version.
+  * Restructured debian packaging system: now there are two packages, a
+    "standard" version that includes all the default options and a "full"
+    version that additionally includes support for TCP wrappers and IDENT
+    lookups.
+
+ -- Alexander Barton <alex@Arthur.Ath.CX>  Thu,  1 Jan 2004 23:12:11 +0100
+

 ngircd (0.7.6-0ab1) unstable; urgency=medium
 
   * New upstream version.
 ngircd (0.7.6-0ab1) unstable; urgency=medium
 
   * New upstream version.

diff --git a/contrib/Debian/control b/contrib/Debian/control
index ec557bccb9a1450a1b303f4102655ee3bc15dadb..0b7a364b10b8d0c051be8498a4474a966cf31a41 100644 (file)
--- a/contrib/Debian/control
+++ b/contrib/Debian/control
@@ -2,7 +2,7 @@ Source: ngircd
 Section: net
 Priority: optional
 Maintainer: Alexander Barton <alex@barton.de>
 Section: net
 Priority: optional
 Maintainer: Alexander Barton <alex@barton.de>

-Build-Depends: debhelper (>> 4.0.0), libz-dev
+Build-Depends: debhelper (>> 4.0.0), libz-dev, libwrap-dev, libident-dev

 Standards-Version: 3.5.8
 
 Package: ngircd
 Standards-Version: 3.5.8
 
 Package: ngircd


@@ -13,7 +13,31 @@ Description: A lightweight daemon for the Internet Relay Chat (IRC)
  network. It is written from scratch and is not based upon the original
  IRCd like many others.
  .
  network. It is written from scratch and is not based upon the original
  IRCd like many others.
  .

- Advantages:
+ This package contains the "standard distribution", including support for
+ syslog logging and compressed server-links using zlib.
+ .
+ Advantages of ngIRCd:
+  - no problems with servers using changing/non-static IP addresses.
+  - small and lean configuration file.
+  - free, modern and open source C code.
+  - still under active development.
+ .
+ ngIRCd is compatible to the "original" ircd 2.10.3p3, so you can run
+ mixed networks.
+
+Package: ngircd-full
+Architecture: any
+Depends: ${shlibs:Depends} ${misc:Depends}
+Conflicts: ngircd
+Description: A lightweight daemon for the Internet Relay Chat (IRC)
+ ngIRCd is a free open source daemon for the Internet Relay Chat (IRC)
+ network. It is written from scratch and is not based upon the original
+ IRCd like many others.
+ .
+ This package includes support for TCP wrappers and IDENT requests in
+ addition to the features of the "standard package".
+ .
+ Advantages of ngIRCd:

   - no problems with servers using changing/non-static IP addresses.
   - small and lean configuration file.
   - free, modern and open source C code.
   - no problems with servers using changing/non-static IP addresses.
   - small and lean configuration file.
   - free, modern and open source C code.

diff --git a/contrib/Debian/rules b/contrib/Debian/rules
index 5bbd52932e80a893482b49a2a8e29f2b0c69d17d..8aa59e3ec45e6e411a6b9989c17902286c4ba876 100755 (executable)
--- a/contrib/Debian/rules
+++ b/contrib/Debian/rules
@@ -11,7 +11,7 @@
 #
 # debian/rules for ngIRCd
 #
 #
 # debian/rules for ngIRCd
 #

-# $Id: rules,v 1.1 2003/12/31 17:20:11 alex Exp $
+# $Id: rules,v 1.2 2004/01/01 22:24:48 alex Exp $

 #
 # Based on the sample debian/rules that uses debhelper,
 # GNU copyright 1997 to 1999 by Joey Hess.
 #
 # Based on the sample debian/rules that uses debhelper,
 # GNU copyright 1997 to 1999 by Joey Hess.


@@ -36,33 +36,59 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
 
        INSTALL_PROGRAM += -s
 endif
 

-config.status: configure
+configure-ngircd: configure

        dh_testdir
 
        dh_testdir
 

-       # Add here commands to configure the package.
+       # configure "standard" variant:

        ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
          --prefix=/usr \
          --sysconfdir=/etc/ngircd \
          --mandir=\$${prefix}/share/man \
          --with-syslog --with-zlib
 
        ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
          --prefix=/usr \
          --sysconfdir=/etc/ngircd \
          --mandir=\$${prefix}/share/man \
          --with-syslog --with-zlib
 

-build: build-stamp
+configure-ngircd-full: configure
+       dh_testdir
+
+       # configure "full" variant:
+       ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+         --prefix=/usr \
+         --sysconfdir=/etc/ngircd \
+         --mandir=\$${prefix}/share/man \
+         --with-syslog --with-zlib --with-tcp-wrappers --with-ident
+
+build:
+       dh_clean -k
+
+build-ngircd: build-stamp-ngircd
+build-stamp-ngircd: configure-ngircd
+       dh_testdir
+       rm -f build-stamp-*

 
 

-build-stamp: config.status
+       # Add here commands to compile the "standard" package:
+       $(MAKE)
+
+       touch build-stamp-ngircd
+
+build-ngircd-full: build-stamp-ngircd-full
+build-stamp-ngircd-full: configure-ngircd-full

        dh_testdir
        dh_testdir

+       rm -f build-stamp-*

 
 

-       # Add here commands to compile the package.
+       # Add here commands to compile the "full" package:

        $(MAKE)
 
        $(MAKE)
 

-       touch build-stamp
+       touch build-stamp-ngircd-full

 
 clean:
        dh_testdir
        dh_testroot
 
 clean:
        dh_testdir
        dh_testroot

-       rm -f build-stamp 
+       rm -f build-stamp*
+       rm -f $(CURDIR)/debian/ngircd-full.default
+       rm -f $(CURDIR)/debian/ngircd-full.init
+       rm -f $(CURDIR)/debian/ngircd-full.postinst

 
 

-       # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
+       # Add here commands to clean up after the build process:
+       -$(MAKE) clean

 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub


@@ -72,36 +98,56 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 endif
        dh_clean
 
 endif
        dh_clean
 

-install: build
+install: install-ngircd install-ngircd-full
+
+install-ngircd: build-ngircd

        dh_testdir
        dh_testroot
        dh_testdir
        dh_testroot

-       dh_clean -k

        dh_installdirs
 
        dh_installdirs
 

-       # Add here commands to install the package into debian/ngircd.
+       # Add here commands to install the "standard" package into debian/ngircd:

        $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd
        $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd

-       rm -f $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/INSTALL*
-       rm -f $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/COPYING*
+       rm $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/INSTALL*
+       rm $(CURDIR)/debian/ngircd/usr/share/doc/ngircd/COPYING*
+
+install-ngircd-full: build-ngircd-full
+       dh_testdir
+       dh_testroot
+       dh_installdirs
+
+       # Add here commands to install the "full" package into debian/ngircd-full:
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/ngircd-full
+       rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd/INSTALL*
+       rm $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd/COPYING*
+       mv $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd \
+        $(CURDIR)/debian/ngircd-full/usr/share/doc/ngircd-full

 
 # Build architecture-independent files here.
 
 # Build architecture-independent files here.

-binary-indep: build install
+binary-indep:

        # We have nothing to do by default.
 
 # Build architecture-dependent files here.
 binary-arch: build install
        # We have nothing to do by default.
 
 # Build architecture-dependent files here.
 binary-arch: build install

+       ln -s $(CURDIR)/debian/ngircd.default \
+        $(CURDIR)/debian/ngircd-full.default
+       ln -s $(CURDIR)/debian/ngircd.init \
+        $(CURDIR)/debian/ngircd-full.init
+       ln -s $(CURDIR)/debian/ngircd.postinst \
+        $(CURDIR)/debian/ngircd-full.postinst
+       

        dh_testdir
        dh_testroot
        dh_testdir
        dh_testroot

-       dh_installchangelogs ChangeLog
-       dh_installdocs
-       dh_installinit
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+       dh_installchangelogs -a -A ChangeLog
+       dh_installdocs -a
+       dh_installinit -a
+       dh_strip -a
+       dh_compress -a
+       dh_fixperms -a
+       dh_installdeb -a
+       dh_shlibdeps -a
+       dh_gencontrol -a
+       dh_md5sums -a
+       dh_builddeb -a

 
 binary: binary-indep binary-arch
 
 
 binary: binary-indep binary-arch