Skip to content

Commit

Permalink
Set package arches and add missing icon sizes
Browse files Browse the repository at this point in the history
The dependency on libcpuid14 constrains builds for any architectures but
amd64 and i386. Also, the gbp.conf file had a [git-dch] section that
should've been '[dch]'. Finally, some standard FreeDesktop icon sizes
were absent.

* Declare the architectures for the binary package in debian/control as
  'any-amd64 any-i386'
* Add .png files corresponding to missing icon sizes in pixmaps/ and add
  them to the install and uninstall rules in the corresponding Makefile
* Correct gbp.conf syntax and add several useful sections with optimal
  keys and values

Signed-off-by: Peter J. Mello <[email protected]>
  • Loading branch information
RogueScholar committed May 11, 2020
1 parent f58fcbf commit 972743f
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 3 deletions.
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Vcs-Browser: https://github.com/eloaders/I-Nex
Rules-Requires-Root: no

Package: i-nex
Architecture: any
Architecture: any-amd64 any-i386
Depends: libcpuid14, mesa-utils, pastebinit, gambas3-gb-desktop (>= 3.8.4~),
gambas3-gb-desktop-x11, gambas3-gb-form (>= 3.8.4~),
gambas3-gb-image (>= 3.8.4~), gambas3-gb-qt5, gambas3-runtime (>= 3.8.4~),
Expand Down
32 changes: 30 additions & 2 deletions debian/gbp.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,35 @@
[DEFAULT]
debian-branch = master
upstream-branch = master
debian-branch = debian
pristine-tar = True

[buildpackage]
upstream-tree = tag
compression = xz
compression-level = 6e
notify = auto
submodules = True

[clone]
pristine-tar = True

[git-dch]
[dch]
meta = True
git-author = True
ignore-regex=(Signed-off|Acked)-by:

[import-orig]
dch = False
filter = [
'.bzr',
'.git',
'debian/*'
]
filter-pristine-tar = True

[pq]
patch-numbers = True
patch-num-format = '%02d-'

[pull]
pristine-tar = True
15 changes: 15 additions & 0 deletions pixmaps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,23 @@ include ../i-nex.mk
install:
install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
install --mode=0644 i-nex.png \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps
install --mode=0644 -T i-nex-128.png \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/i-nex.png
install --mode=0644 -T i-nex-64.png \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps/i-nex.png
install --mode=0644 -T i-nex-48.png \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/i-nex.png
install --mode=0644 -T i-nex-32.png \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/i-nex.png
install --mode=0644 -T i-nex-22.png \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/i-nex.png
install --mode=0644 -T i-nex-16.png \
$(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/i-nex.png

Expand All @@ -21,7 +30,13 @@ uninstall:
${RM} $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/i-nex.png ; fi
if test -f ${DESTDIR}$(PREFIX)/share/icons/hicolor/128x128/apps/i-nex.png ; then \
${RM} $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/i-nex.png ; fi
if test -f ${DESTDIR}$(PREFIX)/share/icons/hicolor/64x64/apps/i-nex.png ; then \
${RM} $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps/i-nex.png ; fi
if test -f ${DESTDIR}$(PREFIX)/share/icons/hicolor/48x48/apps/i-nex.png ; then \
${RM} $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/i-nex.png ; fi
if test -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/i-nex.png ; then \
${RM} $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/i-nex.png ; fi
if test -f ${DESTDIR}$(PREFIX)/share/icons/hicolor/22x22/apps/i-nex.png ; then \
${RM} $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/i-nex.png ; fi
if test -f ${DESTDIR}$(PREFIX)/share/icons/hicolor/16x16/apps/i-nex.png ; then \
${RM} $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/i-nex.png ; fi
Binary file added pixmaps/i-nex-22.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pixmaps/i-nex-48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added pixmaps/i-nex-64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 972743f

Please sign in to comment.