diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index 99440bc..8a2c813 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,24 @@ Source: mintmenu Section: admin Priority: optional Maintainer: Clement Lefebvre -Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 9), python +Standards-Version: 3.9.5 Package: mintmenu Architecture: all -Depends: python (>= 2.4), python (<< 3), python-gtk2, python-glade2, mint-common, python-mate-menu, python-xdg, libmatepanelapplet, libmatedesktop, mate-menus, gvfs-bin, python-xlib, gir1.2-mate-panel, gir1.2-gtk-2.0, mozo +Depends: + ${python:Depends}, + ${misc:Depends}, + python (>= 2.4), python (<< 3), + python-gtk2, python-glade2, + mint-common, + python-mate-menu, python-xdg, + libmatepanelapplet, libmatedesktop, + mate-menus, + gvfs-bin, + python-xlib, + gir1.2-mate-panel, gir1.2-gtk-2.0, + mozo Description: Advanced MATE menu - One of the most advanced menus under Linux. MintMenu supports filtering, favorites, easy-uninstallation, autosession, and many other features. + One of the most advanced menus under Linux. MintMenu supports filtering, + favorites, easy-uninstallation, autosession, and many other features. diff --git a/debian/copyright b/debian/copyright index 974994f..e6166c1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1 +1,20 @@ -This package is under GPL2, Clement Lefebvre 2008. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: mintmenu +Upstream-Contact: Clement Lefebvre +Source: https://github.com/linuxmint/mintmenu + +Files: * +Copyright: 2007-2014 Clement Lefebvre +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index ecde142..0000000 --- a/debian/dirs +++ /dev/null @@ -1,6 +0,0 @@ -usr/lib/linuxmint -usr/lib/linuxmint/mintMenu -usr/lib/linuxmint/mintMenu/plugins -usr/lib/matecomponent -usr/lib/matecomponent/servers - diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..73752c9 --- /dev/null +++ b/debian/install @@ -0,0 +1 @@ +usr diff --git a/debian/rules b/debian/rules index 0874fa3..c215171 100755 --- a/debian/rules +++ b/debian/rules @@ -1,90 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/mintmenu. - #$(MAKE) install DESTDIR=$(CURDIR)/debian/mintmenu - mkdir -p $(CURDIR)/debian/mintmenu - cp -r $(CURDIR)/usr $(CURDIR)/debian/mintmenu/ - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +%: + dh ${@} --with python2 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/usr/bin/mintmenu b/usr/bin/mintmenu index e2f90c2..81d7a0a 100755 --- a/usr/bin/mintmenu +++ b/usr/bin/mintmenu @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys, os diff --git a/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service b/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service old mode 100755 new mode 100644