* debhelper v4

   * DEB_BUILD_OPTS support

diff --git a/Makefile b/Makefile
index 3e05b6e0f6284b0e01e08a04ba430e0c192821c7..d4b7344b0f3ef9da29ee4543c8cf6cf3735a2aff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,25 @@
-# Various dialect translators.
-
-LEX     = flex
-
-BUILD   = jethro kraut cockney jive nyc ken ky00te newspeak
-OTHER   = eleet b1ff chef jibberish upside-down rasterman studly fudd
+LEX    = flex
+BUILD  = jethro kraut cockney jive nyc ken ky00te newspeak
+OTHER  = eleet b1ff chef jibberish upside-down rasterman studly fudd
+CFLAGS = -O2
+INSTALL_PROGRAM = install
+
+# DEB_BUILD_OPTIONS suport, to control binary stripping.
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
+
+# And debug building.
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -g
+endif
 
 all:   $(OTHER) $(BUILD)
 
 install:       $(BUILD) $(OTHER)
        install -d $(PREFIX)/usr/games
-       install $(BUILD) $(OTHER) $(PREFIX)/usr/games/
+       $(INSTALL_PROGRAM) $(BUILD) $(PREFIX)/usr/games/
+       install $(OTHER) $(PREFIX)/usr/games/
        install -d $(PREFIX)/usr/share/man/man6
        install -m 0644 filters.6 $(PREFIX)/usr/share/man/man6
        cd $(PREFIX)/usr/share/man/man6 && \
@@ -28,8 +38,7 @@ clean:
 .l:
        $(RM) $*.c
        $(LEX) -t $< > $*.c
-       $(CC) -O -o $@ $*.c -lfl -g
-#      strip $@
+       $(CC) -O -o $@ $*.c -lfl $(CFLAGS)
        $(RM) $*.c
 
 .SUFFIXES: .dir

diff --git a/debian/changelog b/debian/changelog
index ffa5d4e33c2dfe02f5491514f7047e03d4b701b3..1626a676fbd0deba9c1c8643cc7dff6deee215ff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+filters (2.24) unstable; urgency=low
+
+  * debhelper v4
+  * DEB_BUILD_OPTS support
+
+ -- Joey Hess <joeyh@debian.org>  Sat,  1 Jun 2002 16:45:49 -0400
+
 filters (2.23) unstable; urgency=low
 
   * Patch from Seneca <seneca-cunningham@rogers.com> to correct newspeak's

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4

diff --git a/debian/control b/debian/control
index 859e90acc77d9818f456b18eff69c444294fb50a..6b3b98ab83b82f5d812c6087d451904e2b6d4b39 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: filters
 Section: games
 Priority: optional
-Build-Depends: debhelper (>= 3), flex, bison | byacc | btyacc
+Build-Depends: debhelper (>= 3), flex, bison | byacc | btyacc, dpkg-dev (>= 1.9.0)
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.5.6.1
 
@@ -9,7 +9,7 @@ Package: filters
 Architecture: any
 Conflicts: filters-nonfree
 Replaces: filters-nonfree
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: a collection of filters, including B1FF and the Swedish Chef
  A collection of filters to do all sorts of strange things to text.
  This includes such favorites as B1FF and the Swedish Chef, and a wide

diff --git a/debian/rules b/debian/rules
index 9e8bbc80a913965c9855247f545be8d0bb788c59..3349c552c9223b00f35507fdc508fac87a6275a6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,4 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
 
 build: build-stamp
 build-stamp:
@@ -21,11 +14,8 @@ clean:
        -$(MAKE) -i clean
        dh_clean
 
-# Build architecture-independent files here.
 binary-indep: build
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build
        dh_testdir
        dh_testroot