update debian packaging

diff --git a/debian/changelog b/debian/changelog
index 89184c130a22b5480d9ec1779b731cd570f0649c..c4c2681c47ffa227ff076968796f354fc1554d25 100644 (file)
--- 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 <michael@stapelberg.de>  Fri, 27 Jan 2012 19:34:11 +0000
+ -- Michael Stapelberg <michael@stapelberg.de>  Wed, 19 Sep 2012 18:13:15 +0200
+
+i3-wm (4.3-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Michael Stapelberg <stapelberg@debian.org>  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 ed6cb465f542b1c1cf5b764513c76d56744f0be4..17b8ee4cb9ba7522e3e38f717b021ca1c4363a3d 100644 (file)
--- 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 <stapelberg@debian.org>
+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 0d71f7c4d3fe14f8dee694d500782ae12a7188eb..9616162493dd78f3b3c400f934fa3f5def731545 100644 (file)
--- 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 <stapelberg@debian.org>
+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 6bae8165b42102cafac987fa6ecc07165830a1d9..011119d0188950ad4f868af90cfa89b7d8b6d150 100755 (executable)
--- 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