update debian packaging

diff --git a/debian/changelog b/debian/changelog
index 2e006168536593d1b7f3190255c1cd0b991c7f2b..be459af507f92a103d9a2c1b42f616358210e5f3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 i3-wm (4.1-1) unstable; urgency=low
 
+  * Switch to dpkg-source 3.0 (quilt) and compat level 7
   * Implement system tray support in i3bar (for NetworkManager, Skype, …)
   * i3bar is now configurable in the i3 configfile
   * Implement support for PCRE regular expressions in criteria

diff --git a/debian/i3-wm.docs b/debian/i3-wm.docs
index baef7cdb2e2da3587f218cb6b38362edb28fd05c..e5896855a0c396d0e49fc3741669a71d0da233d3 100644 (file)
--- a/debian/i3-wm.docs
+++ b/debian/i3-wm.docs
@@ -15,3 +15,5 @@ docs/wsbar.png
 docs/keyboard-layer1.png
 docs/keyboard-layer2.png
 docs/testsuite.html
+docs/i3-sync-working.png
+docs/i3-sync.png

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..bb1d8d2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-x-terminal-emulator

diff --git a/debian/patches/use-x-terminal-emulator b/debian/patches/use-x-terminal-emulator
new file mode 100644 (file)
index 0000000..8ad4dae
--- /dev/null
+++ b/debian/patches/use-x-terminal-emulator
@@ -0,0 +1,19 @@
+--- a/i3-sensible-terminal.O   2011-11-11 22:03:52.414218386 +0000
++++ b/i3-sensible-terminal     2011-11-11 22:04:38.372020210 +0000
+@@ -1,13 +1,11 @@
+ #!/bin/sh
+ # This script tries to exec a terminal emulator by trying some known terminal
+ # emulators.
+-#
+-# 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.
+-# Please don't touch the first line, though:
+ which $TERMINAL >/dev/null && exec $TERMINAL "$@"
+ 
++# Debian-specific: use x-terminal-emulator
++which x-terminal-emulator >/dev/null && exec x-terminal-emulator "$@"
++
+ # Hopefully one of these is installed:
+ which xterm >/dev/null && exec xterm "$@"
+ which urxvt >/dev/null && exec urxvt "$@"