MK dir changelogs, new i-nex icon etc

Makefile

@@ -101,7 +101,7 @@ self:
 	$(INSTALL) 0755 inex-usage inex$(bindir)
 	$(INSTALL) 0755 inex-cpusage inex$(bindir)
 	$(INSTALL) 0755 src/i-nex/i-nex.gambas inex$(bindir)
-	$(INSTALL) 0755 pixmaps/i-nex.xpm inex/usr/share/pixmaps/
+	$(INSTALL) 0755 pixmaps/pixmaps/i-nex.xpm inex/usr/share/pixmaps/
 	$(INSTALL) 0755 debian/i-nex.desktop inex/usr/share/applications/
 	$(INSTALL) 0755 debian/check_kernel inex/usr/bin/
 	$(INSTALL) 0755 debian/i-nex-lspci inex/usr/bin/
@@ -200,20 +200,9 @@ install:
 	$(INSTALL) 0755 inex-usage $(DESTDIR)$(bindir)
 	$(INSTALL) 0755 inex-cpusage $(DESTDIR)$(bindir)
 	$(INSTALL) 0755 src/i-nex/i-nex.gambas $(DESTDIR)$(bindir)
-	$(INSTALL) 0755 pixmaps/i-nex.xpm $(DESTDIR)/usr/share/pixmaps/
 	$(INSTALL) 0755 debian/i-nex.desktop $(DESTDIR)/usr/share/applications/
 	$(INSTALL) 0755 debian/check_kernel $(DESTDIR)/usr/bin/
 	$(INSTALL) 0755 debian/i-nex-lspci $(DESTDIR)/usr/bin/
-	$(INSTALL) 0755 debian/changelogs/changelog-0.4.6 $(DESTDIR)/usr/share/doc/i-nex/
-	$(INSTALL) 0755 debian/changelogs/changelog-0.4.8 $(DESTDIR)/usr/share/doc/i-nex/
-	$(INSTALL) 0755 debian/changelogs/changelog-0.4.8.1 $(DESTDIR)/usr/share/doc/i-nex/
-	$(INSTALL) 0755 debian/changelogs/changelog-0.5.0 $(DESTDIR)/usr/share/doc/i-nex/
-	$(INSTALL) 0755 debian/changelogs/changelog-0.5.1 $(DESTDIR)/usr/share/doc/i-nex/
-	$(INSTALL) 0755 debian/changelogs/changelog-0.5.2 $(DESTDIR)/usr/share/doc/i-nex/
-	$(INSTALL) 0755 debian/changelogs/changelog-0.5.4 $(DESTDIR)/usr/share/doc/i-nex/
-	$(INSTALL) 0755 debian/changelogs/changelog-0.5.6 $(DESTDIR)/usr/share/doc/i-nex/
-	$(INSTALL) 0755 debian/changelogs/changelog-0.5.8 $(DESTDIR)/usr/share/doc/i-nex/
-	$(INSTALL) 0755 debian/changelogs/changelog-0.6.0 $(DESTDIR)/usr/share/doc/i-nex/
 	$(INSTALL) 0755 I-Nex.LICENSE $(DESTDIR)/usr/share/doc/i-nex/
 	$(INSTALL) 0755 Pastebinit.LICENSE $(DESTDIR)/usr/share/i-nex/pastebinit/
 	$(INSTALL) 0755 pastebin.d/* $(DESTDIR)/usr/share/i-nex/pastebinit/pastebin.d/
@@ -222,6 +211,7 @@ install:
 	$(INSTALL) 0755 README $(DESTDIR)/usr/share/i-nex/pastebinit/
 	$(INSTALL) 0755 release.conf $(DESTDIR)/usr/share/i-nex/pastebinit/
 	$(MAKE) -C pixmaps install
+	$(MAKE) -C changelogs install
 
 uninstall:
 

changelogs/Makefile

@@ -0,0 +1,13 @@
+#!/usr/bin/make -f
+INSTALL = install -m
+install:
+	$(INSTALL) 0755 changelog-0.4.6 $(DESTDIR)/usr/share/doc/i-nex/
+	$(INSTALL) 0755 changelog-0.4.8 $(DESTDIR)/usr/share/doc/i-nex/
+	$(INSTALL) 0755 changelog-0.4.8.1 $(DESTDIR)/usr/share/doc/i-nex/
+	$(INSTALL) 0755 changelog-0.5.0 $(DESTDIR)/usr/share/doc/i-nex/
+	$(INSTALL) 0755 changelog-0.5.1 $(DESTDIR)/usr/share/doc/i-nex/
+	$(INSTALL) 0755 changelog-0.5.2 $(DESTDIR)/usr/share/doc/i-nex/
+	$(INSTALL) 0755 changelog-0.5.4 $(DESTDIR)/usr/share/doc/i-nex/
+	$(INSTALL) 0755 changelog-0.5.6 $(DESTDIR)/usr/share/doc/i-nex/
+	$(INSTALL) 0755 changelog-0.5.8 $(DESTDIR)/usr/share/doc/i-nex/
+	$(INSTALL) 0755 changelog-0.6.0 $(DESTDIR)/usr/share/doc/i-nex/

debian/control

@@ -2,7 +2,10 @@ Source: i-nex
 Section: contrib/admin
 Priority: extra
 Maintainer: eloaders <eloaders@linux.pl>
+Uploaders: eloaders <eloaders@linux.pl>
+Homepage: http://i-nex.linux.pl
 Build-Depends: debhelper (>= 7), 
+  python | python-all | python-dev | python-all-dev,
   pkg-config, dpkg-dev (>= 1.14.17),
   debhelper (>= 5.0.0),
   libcpuid11,
@@ -31,7 +34,7 @@ Build-Depends: debhelper (>= 7),
   mesa-utils (>= 7.6),
   imagemagick
 Standards-Version: 3.9.4
-Homepage: http://i-nex.linux.pl
+Vcs-Browser: https://github.com/eloaders/I-Nex
 Vcs-Git: https://github.com/eloaders/I-Nex.git
 
 Package: i-nex
@@ -50,20 +53,24 @@ Depends: ${shlibs:Depends},
   gambas3-gb-desktop (<< 3.99.0),  
   gambas3-gb-form-stock (>= 3.4.0),
   grep (>= 2.5),
-  mount (>= 2.17),
-  x11-xserver-utils (>= 7.5),
-  lsb-release (>= 4.0),
   bash (>= 4.1),
   coreutils (>= 7.4),
   sed (>= 4.2),
-  pciutils,
-  x11-utils (>= 7.5),
-  mesa-utils (>= 7.6),
   python-configobj
+Replaces: i-nex
+Recommends:
+  mount (>= 2.17),
+  mesa-utils (>= 7.6),
+  x11-utils (>= 7.5),
+  pciutils,
+  lsb-release (>= 4.0),
+  x11-xserver-utils (>= 7.5)
 Description: CPU-Z Alternative for Linux. For Viewing System Device Information.
   I-Nex is an application that gathers information for hardware components.
-  Available on your system and displays it using an user interface similar to the popular Windows tool CPU-Z.
-  CPU, GPU, Motherboard, Sound, Hard disks, RAM, Network, USB, hostname, Linux distribution and version, Xorg, GCC, GLX versions and Linux Kernel info.
+  Available on your system and displays it using an user 
+  interface similar to the popular Windows tool CPU-Z.
+  CPU, GPU, Motherboard, Sound, Hard disks, RAM, Network, USB, hostname, 
+  Linux distribution and version, Xorg, GCC, GLX versions and Linux Kernel info.
   I-Nex can also generate an advanced report for which. 
   You can select what to include and optionally send the report to a service such as Pastebin. 
   It also features an option to take a screenshot of the I-Nex window directly from the application.

debian/docs

@@ -1,13 +1,13 @@
-debian/changelog
-debian/changelogs/changelog-0.4.6
-debian/changelogs/changelog-0.4.8
-debian/changelogs/changelog-0.4.8.1
-debian/changelogs/changelog-0.5.0
-debian/changelogs/changelog-0.5.1
-debian/changelogs/changelog-0.5.2
-debian/changelogs/changelog-0.5.4
-debian/changelogs/changelog-0.5.6
-debian/changelogs/changelog-0.5.8
 debian/copyright
+debian/changelog
+changelogs/changelog-0.4.6
+changelogs/changelog-0.4.8
+changelogs/changelog-0.4.8.1
+changelogs/changelog-0.5.0
+changelogs/changelog-0.5.1
+changelogs/changelog-0.5.2
+changelogs/changelog-0.5.4
+changelogs/changelog-0.5.6
+changelogs/changelog-0.5.8
 Pastebinit.LICENSE
 I-Nex.LICENSE

debian/gbp.conf

@@ -0,0 +1,7 @@
+[DEFAULT]
+debian-branch = master
+pristine-tar = True
+compression = xz
+
+[git-dch]
+meta = True

debian/i-nex.triggers

@@ -0,0 +1,5 @@
+activate /usr/share/applications
+activate /usr/share/man
+activate /usr/share/mime/packages
+activate /usr/share/icons/hicolor
+activate /usr/share/menu

debian/menu

@@ -3,6 +3,6 @@
                      title="i-nex" \
                      longtitle="I-Nex Viewing System Device Information." \
                      icon="/usr/share/pixmaps/i-nex.xpm" \
-                     icon16x16="/usr/share/icons/hicolor/16x16/apps/i-nex.xpm" \
-                     icon32x32="/usr/share/icons/hicolor/32x32/apps/i-nex.xpm" \
+                     icon32x32="/usr/share/pixmaps/i-nex-32.xpm" \
+                     icon16x16="/usr/share/pixmaps/i-nex-16.xpm" \
                      command="/usr/bin/i-nex.gambas"

debian/postinst

@@ -1,4 +1,4 @@
 #!/bin/bash
 if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then
 	update-menus
-fi
+fi

debian/rules

@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
 %:
 	dh $@
-
+override_dh_pysupport:
+	dh_python2
 override_dh_builddeb:
 	dh_builddeb -- -z9 -Zxz
-override_dh_installmenu:
-	dh_installmenu --noscripts
 override_dh_installman:
 	dh_installman debian/manpages/check_kernel.1 -p i-nex
 	dh_installman debian/manpages/i-nex-lspci.1 -p i-nex

pixmaps/Makefile

@@ -3,31 +3,45 @@ INSTALL = install
 MKDIR_P = mkdir -p
 datarootdir = /usr/share
 make: 
-	${MKDIR_P} 16x16  
+	${MKDIR_P} 16x16
+	${MKDIR_P} 22x22
 	${MKDIR_P} 32x32
+	${MKDIR_P} 48x48
 	${MKDIR_P} pixmaps
-	convert i-nex.xpm -resize 16x16 16x16/i-nex.xpm
-	convert i-nex.xpm -resize 32x32 32x32/i-nex.xpm
-	convert i-nex.xpm -resize 32x32 pixmaps/i-nex.xpm
+	convert i-nex.png -resize 16x16 16x16/i-nex.xpm
+	convert i-nex.png -resize 32x32 32x32/i-nex.xpm
+	convert i-nex.png -resize 22x22 22x22/i-nex.xpm
+	convert i-nex.png -resize 48x48 48x48/i-nex.xpm
+	convert i-nex.png -resize 96x96 pixmaps/i-nex.xpm
 
 install:
 	${MKDIR_P} ${DESTDIR}${datarootdir}/pixmaps
 	${MKDIR_P} ${DESTDIR}${datarootdir}/icons/hicolor/22x22/apps
 	${MKDIR_P} ${DESTDIR}${datarootdir}/icons/hicolor/16x16/apps
 	${MKDIR_P} ${DESTDIR}${datarootdir}/icons/hicolor/32x32/apps
-
-	${INSTALL} -m 644 32x32/i-nex.xpm "${DESTDIR}${datarootdir}/pixmaps/"
+	${MKDIR_P} ${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps
+	${INSTALL} -m 644 pixmaps/i-nex.xpm "${DESTDIR}${datarootdir}/pixmaps/"
+	${INSTALL} -m 644 16x16/i-nex.xpm "${DESTDIR}${datarootdir}/pixmaps/i-nex-16.xpm"
+	${INSTALL} -m 644 32x32/i-nex.xpm "${DESTDIR}${datarootdir}/pixmaps/i-nex-32.xpm"
 	${INSTALL} -m 644 16x16/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/16x16/apps/"
+	${INSTALL} -m 644 22x22/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/22x22/apps/"
 	${INSTALL} -m 644 32x32/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/32x32/apps/"
-
+	${INSTALL} -m 644 48x48/i-nex.xpm "${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps/"
+
 uninstall:
+
+	if test -f "${DESTDIR}${datarootdir}/icons/hicolor/16x16/apps/i-nex.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/16x16/apps/i-nex.xpm" ; fi
+	if test -f "${DESTDIR}${datarootdir}/icons/hicolor/22x22/apps/i-nex.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/22x22/apps/i-nex.xpm" ; fi
+	if test -f "${DESTDIR}${datarootdir}/icons/hicolor/32x32/apps/i-nex.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/32x32/apps/i-nex.xpm" ; fi
 	if test -f "${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps/i-nex.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/48x48/apps/i-nex.xpm" ; fi
-	if test -f "${DESTDIR}${datarootdir}/icons/hicolor/scalable/apps/i-nex.svg" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/scalable/apps/i-nex.svg" ; fi
-	if test -f "${DESTDIR}${datarootdir}/icons/hicolor/scalable/apps/i-nex.svg" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/scalable/apps/i-nex.svg" ; fi
-	if test -f "${DESTDIR}${datarootdir}/icons/hicolor/scalable/apps/i-nex.svg" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/scalable/apps/i-nex.svg" ; fi
-	if test -f "${DESTDIR}${datarootdir}/icons/hicolor/scalable/apps/i-nex.svg" ; then ${RM} "${DESTDIR}${datarootdir}/icons/hicolor/scalable/apps/i-nex.svg" ; fi
+	if test -f "${DESTDIR}${datarootdir}/pixmaps/i-nex.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/pixmaps/i-nex.xpm" ; fi
+	if test -f "${DESTDIR}${datarootdir}/pixmaps/i-nex-16.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/pixmaps/i-nex-16.xpm" ; fi
+	if test -f "${DESTDIR}${datarootdir}/pixmaps/i-nex-32.xpm" ; then ${RM} "${DESTDIR}${datarootdir}/pixmaps/i-nex-32.xpm" ; fi
+
 clean:
 
 	rm -Rf pixmaps
-	rm -Rf 16x16  
-	rm -Rf 32x32
+	rm -Rf 16x16
+	rm -Rf 22x22
+	rm -Rf 32x32
+	rm -Rf 48x48