Skip to content

Commit

Permalink
Merge branch 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
eloaders committed Dec 2, 2013
2 parents 1f51599 + 1c40b8b commit d58ab97
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 12 deletions.
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ i-nex (0.5.8) unstable; urgency=medium

* NEXT

-- eloaders <eloaders@yahoo.com> Wed, 27 Nov 2013 18:15:38 +0100
-- eloaders <eloaders@linux.pl> Wed, 27 Nov 2013 18:15:38 +0100

i-nex (0.5.6) stable; urgency=medium

Expand Down
11 changes: 5 additions & 6 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Source: i-nex
Section: contrib/admin
Priority: extra
Maintainer: eloaders <eloaders@yahoo.com>
Maintainer: eloaders <eloaders@linux.pl>
Build-Depends: debhelper (>= 7),
pkg-config, dpkg-dev (>= 1.14.17),
debhelper (>= 5.0.0),
Expand All @@ -26,15 +26,15 @@ Build-Depends: debhelper (>= 7),
sed (>= 4.2),
pciutils,
x11-utils (>= 7.5),
mesa-utils (>= 7.6),
hostname
Standards-Version: 3.9.3
mesa-utils (>= 7.6)
Standards-Version: 3.9.4
Homepage: http://tuxportal.pl
Vcs-Git: https://github.com/eloaders/I-Nex.git

Package: i-nex
Architecture: any
Depends: gambas3-runtime (>= 3.4.0),
Depends: ${shlibs:Depends},
gambas3-runtime (>= 3.4.0),
gambas3-gb-image (>= 3.0.90),
gambas3-gb-image (<< 3.99.0),
gambas3-gb-qt4 (>= 3.0.90),
Expand All @@ -55,7 +55,6 @@ Depends: gambas3-runtime (>= 3.4.0),
pciutils,
x11-utils (>= 7.5),
mesa-utils (>= 7.6),
hostname,
python,
python-configobj
Description: A CPU-Z Alternative for Linux. For Viewing System Device Information
Expand Down
6 changes: 3 additions & 3 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Source: https://launchpad.net/i-nex


Files: src/i-nex.*
Copyright: 2011-2012 I-Nex authors and contributors
License: LGPL v3
Copyright: 2011-2013 I-Nex authors and contributors
License: LGPL-3+

Files: *
Copyright: 2006-2010, Stéphane Graber, Daniel Bartlett, David Paleino
License: GNU GPL v2, GNU GPL v3
License: GPL-3+

Files: pastebin.d/* po/*
utils/* COPYING
Expand Down
2 changes: 1 addition & 1 deletion debian/i-nex.install
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
src/i-nex/i-nex.gambas usr/bin
src/i-nex/logo/i-nex.0.4.x.png usr/share/pixmaps
src/i-nex/logo/i-nex.0.4.x.png usr/share/pixmaps/
debian/i-nex.desktop usr/share/applications
debian/check_kernel usr/bin
debian/i-nex-lspci usr/bin
Expand Down
4 changes: 4 additions & 0 deletions debian/postinst
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then
update-menus
fi
4 changes: 4 additions & 0 deletions debian/postrm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
if [ -x "`which update-menus 2>/dev/null`" ]; then
update-menus ;
fi
4 changes: 3 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
dh $@

override_dh_builddeb:
dh_builddeb -- -Zbzip2
dh_builddeb -- -Zbzip2
override_dh_installmenu:
dh_installmenu --noscripts

0 comments on commit d58ab97

Please sign in to comment.