diff --git a/debian/changelog b/debian/changelog index bc64b6d..e43a0dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,14 @@ -openbox-menu (0.5.1-1) UNRELEASED; urgency=low +openbox-menu (0.5.1-1) unstable; urgency=low * New upstream release. * debian/rules: - + Install binary to usr/bin. + + install binary to usr/bin. + + disable tests. * debian/control: + add depends to packages provides menu files. + * Refresh debian/patches/debian_build.patch. - -- Mateusz Łukasik Fri, 29 Nov 2013 21:54:43 +0100 + -- Mateusz Łukasik Sat, 30 Nov 2013 11:43:27 +0100 openbox-menu (0.5.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 15dcf1a..46ee920 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,8 @@ Package: openbox-menu Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, openbox, - lxmenu-data | gnome-menus | libgarcon-common | xdg-menu -Description: Openbox pipe-menu to display entries in *.desktop files - Openbox-menu is a pipemenu for Openbox window manager. It provides - a dynamic menu listing installed applications. Most of the work is +Depends: ${misc:Depends}, ${shlibs:Depends}, openbox, lxmenu-data | gnome-menus | libgarcon-common +Description: openbox pipe-menu to display entries in *.desktop files + openbox-menu is a pipemenu for the openbox window manager. It provides + a dynamic menu listing of installed applications. Most of the work is done by the LXDE library menu-cache. diff --git a/debian/openbox-menu.dirs b/debian/openbox-menu.dirs new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/debian/openbox-menu.dirs @@ -0,0 +1 @@ +usr/bin diff --git a/debian/patches/debian_build.patch b/debian/patches/debian_build.patch index 7dbb1fe..553825e 100644 --- a/debian/patches/debian_build.patch +++ b/debian/patches/debian_build.patch @@ -1,32 +1,15 @@ Description: Make makefile compatible with Debian's standards. Author: Mateusz Łukasik +Last-Update: 2013-11-30 --- a/Makefile +++ b/Makefile -@@ -7,9 +7,9 @@ CC=gcc +@@ -7,7 +7,7 @@ CC=gcc CFLAGS+=-DWITH_ICONS # Uncomment this line if Openbox can display SVG icons # Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must appear.. -# CFLAGS+=-DWITH_SVG +CFLAGS+=-DWITH_SVG --prefix= /usr/local -+prefix= /usr + prefix= /usr/local DESTDIR ?= $(prefix) - BINDIR= ${DESTDIR}/bin - -@@ -37,10 +37,10 @@ install: - doc: - robodoc --src . --doc doc/ --multidoc --index --html --cmode - --check: openbox-menu -- ./openbox-menu > test.xml -- xmllint test.xml -- rm test.xml -+#check: openbox-menu -+# ./openbox-menu > test.xml -+# xmllint test.xml -+# rm test.xml - - changelog: - @hg log --style changelog > ChangeLog diff --git a/debian/rules b/debian/rules index 2bb0249..ddf4bbe 100755 --- a/debian/rules +++ b/debian/rules @@ -1,12 +1,11 @@ #!/usr/bin/make -f +export DEB_BUILD_OPTIONS=nocheck %: dh $@ -override_dh_install: - dh_install - mkdir debian/openbox-menu/usr - mv debian/openbox-menu/bin/ debian/openbox-menu/usr/bin/ +override_dh_auto_install: + $(MAKE) install BINDIR=$(CURDIR)/debian/openbox-menu/usr/bin override_dh_installman: dh_installman