From 1bc41edb6daa5e92ee58a6ffd896e4f538f6dea7 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Wed, 19 Sep 2012 18:44:13 +0200 Subject: [PATCH] update debian packaging --- debian/changelog | 10 ++++++++-- .../patches/manpage-x-terminal-emulator.patch | 8 ++++++++ debian/patches/use-x-terminal-emulator.patch | 18 +++++++++++++----- debian/rules | 2 +- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 89184c13..c4c2681c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ -i3-wm (4.2.1-0) unstable; urgency=low +i3-wm (4.3.1-0) unstable; urgency=low * NOT YET RELEASED - -- Michael Stapelberg Fri, 27 Jan 2012 19:34:11 +0000 + -- Michael Stapelberg Wed, 19 Sep 2012 18:13:15 +0200 + +i3-wm (4.3-1) experimental; urgency=low + + * New upstream release + + -- Michael Stapelberg Wed, 19 Sep 2012 18:13:40 +0200 i3-wm (4.2-1) unstable; urgency=low diff --git a/debian/patches/manpage-x-terminal-emulator.patch b/debian/patches/manpage-x-terminal-emulator.patch index ed6cb465..17b8ee4c 100644 --- a/debian/patches/manpage-x-terminal-emulator.patch +++ b/debian/patches/manpage-x-terminal-emulator.patch @@ -1,3 +1,11 @@ +Description: list x-terminal-emulator as one of i3-sensible-terminal’s choices +Author: Michael Stapelberg +Origin: vendor +Forwarded: not-needed +Last-Update: 2011-12-28 + +--- + Index: i3-4.1.1/man/i3-sensible-terminal.man =================================================================== --- i3-4.1.1.orig/man/i3-sensible-terminal.man 2011-12-28 23:56:55.487581000 +0100 diff --git a/debian/patches/use-x-terminal-emulator.patch b/debian/patches/use-x-terminal-emulator.patch index 0d71f7c4..96161624 100644 --- a/debian/patches/use-x-terminal-emulator.patch +++ b/debian/patches/use-x-terminal-emulator.patch @@ -1,7 +1,15 @@ -Index: i3-4.1.1/i3-sensible-terminal +Description: i3-sensible-terminal: try x-terminal-emulator first +Author: Michael Stapelberg +Origin: vendor +Forwarded: not-needed +Last-Update: 2012-09-19 + +--- + +Index: i3-4.3/i3-sensible-terminal =================================================================== ---- i3-4.1.1.orig/i3-sensible-terminal 2011-12-28 23:51:52.455610236 +0100 -+++ i3-4.1.1/i3-sensible-terminal 2011-12-28 23:52:00.826775027 +0100 +--- i3-4.3.orig/i3-sensible-terminal 2012-09-19 18:08:09.000000000 +0200 ++++ i3-4.3/i3-sensible-terminal 2012-09-19 18:32:06.393883488 +0200 @@ -4,11 +4,7 @@ # # This script tries to exec a terminal emulator by trying some known terminal @@ -10,8 +18,8 @@ Index: i3-4.1.1/i3-sensible-terminal -# Distributions/packagers should enhance this script with a -# distribution-specific mechanism to find the preferred terminal emulator. On -# Debian, there is the x-terminal-emulator symlink for example. --for terminal in $TERMINAL urxvt rxvt terminator Eterm aterm xterm gnome-terminal roxterm; do -+for terminal in $TERMINAL x-terminal-emulator urxvt rxvt terminator Eterm aterm xterm gnome-terminal roxterm; do +-for terminal in $TERMINAL urxvt rxvt terminator Eterm aterm xterm gnome-terminal roxterm xfce4-terminal; do ++for terminal in $TERMINAL x-terminal-emulator urxvt rxvt terminator Eterm aterm xterm gnome-terminal roxterm xfce4-terminal; do if which $terminal > /dev/null 2>&1; then exec $terminal "$@" fi diff --git a/debian/rules b/debian/rules index 6bae8165..011119d0 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ override_dh_auto_build: $(MAKE) -C docs override_dh_installchangelogs: - dh_installchangelogs RELEASE-NOTES-4.2 + dh_installchangelogs RELEASE-NOTES-4.3 override_dh_install: $(MAKE) DESTDIR=$(CURDIR)/debian/i3-wm/ install -- 2.39.2