commit 16670eb3fd66233fdbec94656603b2daff8155a6
parent 116fdc62b4a85bd967ad148cc7b8b6e8e4cb8688
Author: Kris Maglione <kris@suckless.org>
Date: Wed, 7 Jul 2010 22:47:39 +0000
[debian] Fix some lintian warnings.
Diffstat:
6 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/debian/control b/debian/control
@@ -2,12 +2,13 @@ Source: wmii-hg
Section: x11
Priority: optional
Maintainer: Kris Maglione <jg@suckless.org>
-Build-Depends: libixp, python, libx11-dev, libxft-dev, libxext-dev, libxinerama-dev, libxrandr-dev, x11proto-xext-dev, quilt, debhelper (>= 4.0)
-Standards-Version: 3.7.2
+Build-Depends: libixp-hg, dash, python, libx11-dev, libxft-dev, libxext-dev, libxinerama-dev, libxrandr-dev, x11proto-xext-dev, quilt, debhelper (>= 4.0)
+Standards-Version: 3.8.4
+Homepage: http://wmii.suckless.org/
Package: wmii-hg
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, dash (>= 0.1)
Conflicts: wmii, wmii2
Replaces: wmii, wmii2
Provides: x-window-manager
@@ -17,5 +18,3 @@ Description: lightweight tabbed and tiled X11 window manager
window management with low memory usage. It is highly modularized and uses an
inter-process communication interface which is oriented on the 9p protocol of
plan9.
- .
- Homepage: <http://wmii.suckless.org/>
diff --git a/debian/docs b/debian/docs
@@ -1 +1,2 @@
+FAQ
README
diff --git a/debian/patches/01-config-local-mk.patch b/debian/patches/01-config-local-mk.patch
@@ -1,13 +0,0 @@
-Author: Kris Maglione <jg@suckless.org>
-Description: Create a config.local.mk for debian.
-
-diff --git a/config.local.mk b/config.local.mk
-new file mode 100644
---- /dev/null
-+++ b/config.local.mk
-@@ -0,0 +1,5 @@
-+DESTDIR=$(ROOT)/debian/wmii-hg/
-+PREFIX=/usr
-+ETC=/etc/X11
-+STATIC=
-+TERMINAL=x-terminal-emulator
diff --git a/debian/patches/series b/debian/patches/series
@@ -1 +0,0 @@
-01-config-local-mk.patch
diff --git a/debian/rules b/debian/rules
@@ -1,21 +1,32 @@
#!/usr/bin/make -f
-include /usr/share/quilt/quilt.make
+
+PACKAGE=$(shell awk 'NR == 1 { print $$2 }' debian/control)
+
+FLAGS = DESTDIR=$(CURDIR)/debian/$(PACKAGE)/ \
+ PREFIX=/usr \
+ ETC=/etc/X11 \
+ STATIC= \
+ TERMINAL=x-terminal-emulator
%:
dh $@
-clean: unpatch
-build: patch
-
override_dh_installwm:
dh_installwm --priority=60
override_dh_compress:
dh_compress -X.pdf
+override_dh_auto_build:
+ $(MAKE) $(FLAGS) all
+
override_dh_auto_install:
- $(MAKE) install
+ $(MAKE) $(FLAGS) install
+
+ rm debian/$(PACKAGE)/usr/share/doc/wmii/LICENSE
+ install -D -m0644 img/icon.png debian/$(PACKAGE)/usr/share/icons/wmii.png
+ install -D -m0644 debian/file/wmii.desktop debian/$(PACKAGE)/usr/share/xsessions/wmii.desktop
- install -D img/icon.png debian/wmii/usr/share/icons/wmii.png
- install -D debian/file/wmii.desktop debian/wmii/usr/share/xsessions/wmii.desktop
+.depend:
+ true
diff --git a/debian/watch b/debian/watch
@@ -1,2 +0,0 @@
-version=3
-http://www.suckless.org/download/wmii-(.*)\.tar\.gz
