[Pkg-xfce-commits] r84 - goodies/xterminal/debian
Emanuele Rocca
ema@costa.debian.org
Wed, 04 May 2005 13:30:50 +0000
Author: ema
Date: 2005-05-04 13:30:49 +0000 (Wed, 04 May 2005)
New Revision: 84
Modified:
goodies/xterminal/debian/changelog
goodies/xterminal/debian/control
goodies/xterminal/debian/menu
goodies/xterminal/debian/rules
Log:
- Renamed to xfce4-terminal
- Switched to cdbs
- Fixed Corsac's mail address
- lintian complains about icon size, linda is happy
Modified: goodies/xterminal/debian/changelog
===================================================================
--- goodies/xterminal/debian/changelog 2005-05-03 19:49:46 UTC (rev 83)
+++ goodies/xterminal/debian/changelog 2005-05-04 13:30:49 UTC (rev 84)
@@ -1,6 +1,5 @@
-xterminal (0.2.4-1) unstable; urgency=low
+xfce4-terminal (0.2.4-1) experimental; urgency=low
* Initial Release (Closes: #302999).
- -- Yves-Alexis Perez <yaperez@corsac.net> Sat, 23 Apr 2005 00:02:36 +0200
-
+ -- Yves-Alexis Perez <corsac@corsac.net> Sat, 23 Apr 2005 00:02:36 +0200
Modified: goodies/xterminal/debian/control
===================================================================
--- goodies/xterminal/debian/control 2005-05-03 19:49:46 UTC (rev 83)
+++ goodies/xterminal/debian/control 2005-05-04 13:30:49 UTC (rev 84)
@@ -1,18 +1,18 @@
-Source: xterminal
+Source: xfce4-terminal
Section: x11
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema@debian.org>, Simon Huggins <huggie@earth.li>, Rudy Godoy <rudy@kernel-panik.org>, Martin Loschwitz <madkiss@debian.org>, Yves-Alexis Perez <corsac@corsac.net>
-Build-Depends: debhelper (>= 4.0.0), dbus-glib-1-dev (>= 0.23.2-3), libexo0.3-dev (>= 0.3.0-1), libvte-dev (>= 0.11.11), libxml-perl, libstartup-notification0-dev
+Build-Depends: debhelper (>= 4.1.0), dbus-glib-1-dev (>= 0.23.2-3), libexo0.3-dev (>= 0.3.0-1), libvte-dev (>= 0.11.11), libxml-perl, libstartup-notification0-dev, cdbs
Standards-Version: 3.6.1
-Package: xterminal
+Package: xfce4-terminal
Architecture: any
Conflicts: terminal
Depends: ${shlibs:Depends}
Provides: x-terminal-emulator
Recommends: dbus-1-utils
-Description: The Terminal emulator application
+Description: Xfce terminal emulator
This package contains Terminal, which is a lightweight and easy to use
terminal emulator for X11. It was created to fit nicely into the Xfce
desktop environment, but it also fits nice with other environments.
Modified: goodies/xterminal/debian/menu
===================================================================
--- goodies/xterminal/debian/menu 2005-05-03 19:49:46 UTC (rev 83)
+++ goodies/xterminal/debian/menu 2005-05-04 13:30:49 UTC (rev 84)
@@ -1,6 +1,6 @@
-?package(xterminal):needs="X11"\
+?package(xfce4-terminal):needs="X11"\
section="XShells"\
- command="/usr/bin/Terminal"\
+ command="/usr/bin/xfce4-terminal"\
title="Terminal"\
- longtitle="X Terminal Emulator"\
+ longtitle="Xfce Terminal Emulator"\
icon="/usr/share/pixmaps/terminal.xpm"
Modified: goodies/xterminal/debian/rules
===================================================================
--- goodies/xterminal/debian/rules 2005-05-03 19:49:46 UTC (rev 83)
+++ goodies/xterminal/debian/rules 2005-05-04 13:30:49 UTC (rev 84)
@@ -1,94 +1,22 @@
#!/usr/bin/make -f
+DEB_AUTO_UPDATE_LIBTOOL := pre
+#DEB_AUTO_UPDATE_ACLOCAL := 1.8
+DEB_AUTO_UPDATE_AUTOCONF := yes
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/autotools.mk
-# 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
-
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --libexecdir=\$${prefix}/sbin --sysconfdir=/etc --enable-dbus --enable-final --enable-startup-notification
-
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/xterminal.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/xterminal
-
- install -c -m 0755 $(CURDIR)/debian/Terminal.wrapper $(CURDIR)/debian/xterminal/usr/bin/Terminal.wrapper
-
- for target in terminal xfce4-terminal xterminal; do \
- ln -sf Terminal $(CURDIR)/debian/xterminal/usr/bin/$$target; \
- ln -sf Terminal.1.gz $(CURDIR)/debian/xterminal/usr/share/man/man1/$$target.1.gz; \
- done
-
- perl -i -pe 's/for browser in mozilla/for browser in sensible-browser mozilla/' $(CURDIR)/debian/xterminal/usr/sbin/TerminalHelp
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installmenu
- dh_desktop
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-final --enable-startup-notification
+
+binary-post-install/xfce4-terminal::
+ mkdir debian/xfce4-terminal/usr/share/doc/xfce4-terminal/html/
+ mv debian/xfce4-terminal/usr/share/doc/Terminal/* debian/xfce4-terminal/usr/share/doc/xfce4-terminal/html/
+ rmdir debian/xfce4-terminal/usr/share/doc/Terminal/
+ mv debian/xfce4-terminal/usr/share/man/man1/Terminal.1 debian/xfce4-terminal/usr/share/man/man1/xfce4-terminal.1
+ cd debian/xfce4-terminal/usr/share/man/man1/ && ln -s xfce4-terminal.1 xfce4-terminal.wrapper.1
+ mv debian/xfce4-terminal/usr/bin/Terminal debian/xfce4-terminal/usr/bin/xfce4-terminal
+ rm debian/xfce4-terminal/usr/bin/terminal
+ install -c -m 0755 debian/Terminal.wrapper debian/xfce4-terminal/usr/bin/xfce4-terminal.wrapper
+ perl -i -pe 's/for browser in mozilla/for browser in sensible-browser mozilla/' debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp
+ perl -i -pe 's#doc/Terminal/#doc/xfce4-terminal/html#' debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp