Changeset 121 for trunk

Timestamp:

11.12.2005 17:13:51 (3 years ago)

Author:

tibob

Message:

• Update for Redhat packages
• Took over Sam's debian control files and adapted them for
  • a non official package
  • new upstream

Location:

trunk

Files:

• debian/changelog (modified) (1 diff)
• debian/compat (added)
• debian/control (modified) (1 diff)
• debian/copyright (modified) (1 diff)
• debian/docs (modified) (1 diff)
• debian/init (modified) (2 diffs)
• debian/postinst.debhelper (added)
• debian/postrm.debhelper (added)
• debian/prerm.debhelper (added)
• debian/rules (modified) (5 diffs)
• debian/substvars (added)
• redhat/ipfm.spec (modified) (1 diff)

trunk/debian/changelog

@@ +1 @@
+ipfm (0.12.0rc1-1) unstable; urgency=low
+
+  * New upstream relase
+
+ -- Robert Chéramy <ipfm-debian@r.cheramy.net>  Sun, 11 Dec 2005 16:50:40 +0100
+
+ipfm (0.11.5-4) unstable; urgency=low
+
+  * Fixed major package breakage caused by a wrong DH_COMPAT value.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sun, 25 Jul 2004 22:22:10 +0200
+
+ipfm (0.11.5-3) unstable; urgency=low
+
+  * debian/control:
+    + Set policy to 3.6.1.1.
+  * debian/rules:
+    + Use dh_installman instead of dh_installmanpages.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Fri, 23 Jul 2004 13:38:25 +0200
+
+ipfm (0.11.5-2) unstable; urgency=low
+
+  * Set policy to 3.5.10.
+  * We build-depend on flex-old instead of flex.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sat, 31 May 2003 00:43:41 +0200
+
+ipfm (0.11.5-1) unstable; urgency=low
+
+  * Version number is now in sync with upstream.
+  * Fixed a spelling error in the copyright file.
+  * Added support for Linux cooked capture datalink (Closes: #167040).
+  * If the default configuration file is present, we do not start ipfm until
+    it was properly tuned (Closes: #183479).
+  * Updated Standards-Version.
+
+ -- Samuel Hocevar <sam@zoy.org>  Sat, 15 Mar 2003 17:29:56 +0100
+
+ipfm (0.11.4-3) unstable; urgency=low
+
+  * Fixed minor grammar errors in the sample configuration (Closes: #146409).
+  * Rebuilt against libpcap0.7 to remove dependency on libpcap0 which got
+    removed from unstable (Closes: #156204).
+
+ -- Samuel Hocevar <sam@zoy.org>  Sun, 18 Aug 2002 12:16:58 +0200
+
+ipfm (0.11.4-2.1) unstable; urgency=low
+
+  * Non maintainer upload
+  * Rebuilt with new libpcap to remove dependency on libpcap0, which I
+    got removed from unstable by accident. Sorry about this...
+
+ -- Torsten Landschoff <torsten@debian.org>  Sat, 10 Aug 2002 11:37:02 +0200
+
+ipfm (0.11.4-2) unstable; urgency=low
+
+  * Fixed build dependencies (Closes: #123754).
+
+ -- Samuel Hocevar <sam@zoy.org>  Fri, 14 Dec 2001 02:38:26 +0100
+
 ipfm (0.11.4-1) unstable; urgency=low
+
   * New upstream release.
-  * Fixed wrong buffer clearing date
+  * Fixed wrong buffer clearing date.
+  * Fixed build dependencies (Closes: #100807).
 
- -- Robert CHERAMY <robert@cheramy.net>  Sun,  7 Jan 2001 19:28:56 +0100
+ -- Samuel Hocevar <sam@zoy.org>  Sun,  7 Jan 2001 19:28:56 +0100
 
 ipfm (0.11.3-1) unstable; urgency=low
+
   * New upstream release.
   * fixed default DUMPINTERVAL
   * fixed Clean() function (last release introduced a possible segfault)
 
- -- Robert CHERAMY <robert@cheramy.net>  Wed, 13 Dec 2000 00:43:09 +0100
+ -- Samuel Hocevar <sam@zoy.org>  Wed, 13 Dec 2000 00:43:09 +0100
 
 ipfm (0.11.2-1) unstable; urgency=low

trunk/debian/control

@@ -2 +2 @@
 Section: net
 Priority: optional
-Maintainer: Robert CHERAMY <robert@cheramy.net>
-Build-depends: libpcap-dev, flex, bison
-Standards-Version: 3.1.1
+Maintainer: Robert Chéramy <ipfm-debian@r.cheramy.net>
+Build-Depends: libpcap0.8-dev, bison, flex, debhelper (>= 4.0)
+Standards-Version: 3.6.1.1
 
 Package: ipfm
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: A bandwidth analysis tool
+Description: a bandwidth analysis tool
  IPFM counts how much data was sent and received by specified hosts through
  an Internet link.

trunk/debian/copyright

@@ -1 @@
-This package was debianized by Robert CHERAMY tibob@via.ecp.fr on
+This package was debianized by Robert CHERAMY <tibob at via.ecp.fr> on
 Fri, 13 Aug 1999 16:00:00 +0200.
+Maintainer for the official Debian package is Sam Hocevar <sam+deb@zoy.org>
 
-It was downloaded from http://www.via.ecp.fr/~tibob/ipfm/
+It was downloaded from http://robert.cheramy.net/ipfm/
 
-Upstream Author(s): Robert CHERAMY <tibob@via.ecp.fr> and
-                    Andres KRAPF <dae@via.ecp.fr>
+Upstream Authors: Robert Chéramy <ipfm-debian@r.cheramy.net>
+                  Andres Krapf <dae@via.ecp.fr>
 
 Copyright: GNU General Public License.
 
-On Debian/GNU Linux systems, a copy of the GNU GPL can be found in
+On Debian GNU/Linux systems, a copy of the GNU GPL can be found in
 /usr/share/common-licenses/GPL.

trunk/debian/docs

@@ -1 +1 @@
 TODO
 HISTORY
-INSTALL

trunk/debian/init

@@ -13 +13 @@
   start)
         echo -n "Starting $DESC: "
+        if grep -q '^ *DISABLED' /etc/ipfm.conf
+        then
+                echo "disabled, please tune /etc/ipfm.conf."
+                exit 0
+        fi
         if start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
                 --exec $DAEMON
@@ -41 +46 @@
                 /var/run/$NAME.pid --exec $DAEMON
         sleep 1
+        if grep -q '^ *DISABLED' /etc/ipfm.conf
+        then
+                echo "disabled, please tune /etc/ipfm.conf."
+                exit 0
+        fi
         start-stop-daemon --start --quiet --pidfile \
                 /var/run/$NAME.pid --exec $DAEMON

trunk/debian/rules

@@ -14 +14 @@
         dh_testdir
 
-        ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc
-        # Add here commands to compile the package.
+        ./configure --prefix=/usr --mandir=/usr/share/man \
+                    --sysconfdir=/etc --localstatedir=/var
+
         $(MAKE) 
 
@@ -27 +28 @@
         # Add here commands to clean up after the build process.
         -$(MAKE) distclean
+        rm -f debian/examples debian/conffiles
 
         dh_clean
@@ -37 +39 @@
         dh_installdirs
 
-        # Add here commands to install the package into debian/tmp.
-        $(MAKE) ROOT=`pwd`/debian/tmp install
+        # Add here commands to install the package into debian/ipfm.
+        $(MAKE) ROOT=`pwd`/debian/ipfm install
+
+        # Add a warning line to the configuration file
+        echo "# Remove this line when finished tuning the configuration" \
+                > debian/ipfm/foo
+        echo "DISABLED" >> debian/ipfm/foo
+        echo "" >> debian/ipfm/foo
+        cat debian/ipfm/etc/ipfm.conf >> debian/ipfm/foo
+        mv -f debian/ipfm/foo debian/ipfm/etc/ipfm.conf
 
         touch install-stamp
@@ -52 +62 @@
         dh_testroot
         dh_installdocs
-        dh_installexamples
+        dh_installexamples ipfm.conf.sample
 #       dh_installmenu
 #       dh_installemacsen
         dh_installinit
 #       dh_installcron
-        dh_installmanpages
+        dh_installman
 #       dh_undocumented
         dh_installchangelogs 
@@ -64 +74 @@
         dh_compress
         dh_fixperms
-# You may want to make some executables suid here
-#       dh_suidregister
 #       dh_makeshlibs
         dh_installdeb

trunk/redhat/ipfm.spec

@@ -1 +1 @@
 Summary: IP Flow Meter is a bandwidth analysis tool
 Name: ipfm
-Version: 0.11.5
+Version: 0.12.0rc1
 Release: 1dm
 Copyright: GPL