From 972743f98c65830d26029e181bf81703ea68f573 Mon Sep 17 00:00:00 2001 From: "Peter J. Mello" Date: Sun, 10 May 2020 19:58:12 -0700 Subject: [PATCH] Set package arches and add missing icon sizes 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 --- debian/control | 2 +- debian/gbp.conf | 32 ++++++++++++++++++++++++++++++-- pixmaps/Makefile | 15 +++++++++++++++ pixmaps/i-nex-22.png | Bin 0 -> 1176 bytes pixmaps/i-nex-48.png | Bin 0 -> 2899 bytes pixmaps/i-nex-64.png | Bin 0 -> 4040 bytes 6 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 pixmaps/i-nex-22.png create mode 100644 pixmaps/i-nex-48.png create mode 100644 pixmaps/i-nex-64.png diff --git a/debian/control b/debian/control index 4565ead..9499217 100644 --- a/debian/control +++ b/debian/control @@ -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~), diff --git a/debian/gbp.conf b/debian/gbp.conf index 1695316..2086d21 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -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 diff --git a/pixmaps/Makefile b/pixmaps/Makefile index 0f5d1b9..57f720b 100644 --- a/pixmaps/Makefile +++ b/pixmaps/Makefile @@ -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 @@ -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 diff --git a/pixmaps/i-nex-22.png b/pixmaps/i-nex-22.png new file mode 100644 index 0000000000000000000000000000000000000000..643527574042998297604a40b09e6d2ec36f302e GIT binary patch literal 1176 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$Ysfq{u7z$e7@|Ns9$H9!)= z0J4E#>GCDZRxDks3O=`}?n3x9-rPL%zPgGBPqo zVK&JV3N2!sOrq_L!fo^eElgt_OvCK-0xcFTS*YV}n%J9X6l5)Jps3|*ym;v%4R-@M zb5(s`3w3vc*>h*9IqSuD=jeKwsyORRnml3N{JF~ZT5(<3+HS_mPC7~sT0Om8v**lQ zykya|X;T&LG?iU+w44pKoeh;7wZt@~g;gX(R3#1UOyu;G#5AO0JF>JK4diXrWz3be zoebrz)Z}f{vu0N)*lB3l>jUFGdDnI+V4NwG1o;Is@GvrQar6HB_xms3Uw(nVzyJOF z`{&Q^KY#wErZ6h2tKOJ;8kEi$lf2zs7&=&GJ%Akc5>H=O_9v{|OyX=CTlhMF(y5*< zjv*44lM@awN{AXTC^IupUbJY^rb&~!Casz@Y1X7&lP0xITBKym+`Vksv}tBS7cO49 znv$4s^|HBviIJJ1shRQi4O=#C+qiY}_2krq(t?7LqB6tcts6G5Fr}M&m-DkP*sy&0 z^zEufA3lC%;rjiPeL+VQ8{5x~Mh0x`?F+ct+gOc_4BFgXqN3a)quip8IkY4{J|ro5 zY)3EXh0xQJ{Wx{D=RDAz47yb*6OO?R+W-JeyRJ+F_{_P(9X=mvfO8`+1~m6jrqsUL~ee5 zMpQ^lP*iyOggNH*2iLS3|B$E<*NxgzadDBV_jKLZT{RcGT)V@VSbs=JED1|w$V`Yi zb>h@Q#!5*x2A9dT7iJjVPXfk)YKdz^NlIc#s#S7PDv)9@GB7gGH89mRGzc*=wlX%d rGBnXPFt9Q(@OdV66GcOAeoAIqC2kG2yBDPbH86O(`njxgN@xNAD&)19 literal 0 HcmV?d00001 diff --git a/pixmaps/i-nex-48.png b/pixmaps/i-nex-48.png new file mode 100644 index 0000000000000000000000000000000000000000..bbfcd7b2e45b5e1821ea196605b1ea7bc10d253d GIT binary patch literal 2899 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 literal 0 HcmV?d00001