[525] in BarnOwl Developers
[D-O-H] r645 - in trunk: . owl/debian
daemon@ATHENA.MIT.EDU (hartmans@MIT.EDU)
Thu Oct 29 18:07:05 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: hartmans@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Date: Sat, 3 Mar 2007 15:02:22 -0500 (EST)
Author: hartmans
Date: 2007-03-03 15:02:21 -0500 (Sat, 03 Mar 2007)
New Revision: 645
Added:
trunk/owl/debian/barnowl.dirs
trunk/owl/debian/barnowl.install
trunk/owl/debian/compat
Removed:
trunk/owl/debian/dirs
Modified:
trunk/
trunk/owl/debian/README.Debian
trunk/owl/debian/control
trunk/owl/debian/rules
Log:
r1702@luminous: hartmans | 2007-03-03 14:49:50 -0500
Update to more modern debhelper.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-debian-local/trunk:1701
bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19195
+ 6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-debian-local/trunk:1702
bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19195
Modified: trunk/owl/debian/README.Debian
===================================================================
--- trunk/owl/debian/README.Debian 2007-03-03 20:02:08 UTC (rev 644)
+++ trunk/owl/debian/README.Debian 2007-03-03 20:02:21 UTC (rev 645)
@@ -1,7 +1,9 @@
-owl for Debian
+barnowl for Debian
--------------
owl is one of the simpler (while still being extensible) non-graphical
zephyr clients, which may make it simpler to get started as a user.
- -- Mark W. Eichin <eichin@thok.org>, Tue, 23 Apr 2002 01:58:14 -0400
+Barnowl is a fork of owl with Jabber support.
+
+ -- Sam Hartman <hartmans@debian.org>, Sat, 3 Mar 2007 14:49:31 -0500
Copied: trunk/owl/debian/barnowl.dirs (from rev 644, trunk/owl/debian/dirs)
===================================================================
--- trunk/owl/debian/barnowl.dirs (rev 0)
+++ trunk/owl/debian/barnowl.dirs 2007-03-03 20:02:21 UTC (rev 645)
@@ -0,0 +1 @@
+usr/bin
Added: trunk/owl/debian/barnowl.install
===================================================================
--- trunk/owl/debian/barnowl.install (rev 0)
+++ trunk/owl/debian/barnowl.install 2007-03-03 20:02:21 UTC (rev 645)
@@ -0,0 +1,3 @@
+usr/bin/barnowl
+usr/share/man/man1/barnowl.1
+usr/share/barnowl
Added: trunk/owl/debian/compat
===================================================================
--- trunk/owl/debian/compat (rev 0)
+++ trunk/owl/debian/compat 2007-03-03 20:02:21 UTC (rev 645)
@@ -0,0 +1 @@
+4
Modified: trunk/owl/debian/control
===================================================================
--- trunk/owl/debian/control 2007-03-03 20:02:08 UTC (rev 644)
+++ trunk/owl/debian/control 2007-03-03 20:02:21 UTC (rev 645)
@@ -1,15 +1,18 @@
-Source: owl
+Source: barnowl
Section: net
Priority: optional
-Maintainer: Mark W. Eichin <eichin@thok.org>
-Build-Depends: debhelper (>> 3.0.0), libzephyr-dev (>= 2.1.20010518.SNAPSHOT-7), libncurses5-dev, libkrb5-dev, libperl-dev
+Maintainer: Sam Hartman <hartmans@debian.org>
+Build-Depends: debhelper (>> 4.0.0), libzephyr-dev (>= 2.1.20010518.SNAPSHOT-7), libncurses5-dev, libkrb5-dev, libperl-dev
Standards-Version: 3.5.2
-Package: owl
+Package: barnowl
Architecture: any
-Depends: ${shlibs:Depends}, zephyr-clients
-Description: A curses-based tty Zephyr client.
+Depends: ${shlibs:Depends},
+Recommends: zephyr-clients
+Description: A curses-based tty Jabber and Zephyr client.
An alternative standalone (doesn't use zwgc) Zephyr (instant
- messaging) client. Has perl hooks and a curses UI.
+ messaging) client. Also supports Jabber.
+ Much of the functionality is written in Perl, which is supported as
+ an extension language.
.
ktools software -- The 'k' is for Quality!
Deleted: trunk/owl/debian/dirs
===================================================================
--- trunk/owl/debian/dirs 2007-03-03 20:02:08 UTC (rev 644)
+++ trunk/owl/debian/dirs 2007-03-03 20:02:21 UTC (rev 645)
@@ -1 +0,0 @@
-usr/bin
Modified: trunk/owl/debian/rules
===================================================================
--- trunk/owl/debian/rules 2007-03-03 20:02:08 UTC (rev 644)
+++ trunk/owl/debian/rules 2007-03-03 20:02:21 UTC (rev 645)
@@ -5,8 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -14,13 +12,15 @@
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O2
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
+ CFLAGS += -g
+
config.status: configure
dh_testdir
# Add here commands to configure the package.
@@ -55,9 +55,10 @@
dh_installdirs
# Add here commands to install the package into debian/owl.
- # $(MAKE) install prefix=$(CURDIR)/debian/owl/usr
- cp owl $(CURDIR)/debian/owl/usr/bin/
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ dh_install --sourcedir=debian/tmp --fail-missing $(EXCLUDE)
+
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
@@ -70,15 +71,8 @@
dh_installdocs doc/intro.txt
dh_installexamples
dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
- dh_installcron
- dh_installman doc/owl.1
+ dh_installman
dh_installinfo
-# dh_undocumented
dh_installchangelogs ChangeLog
dh_link
dh_strip
@@ -86,7 +80,7 @@
dh_fixperms
# dh_makeshlibs
dh_installdeb
-# dh_perl
+ dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
