.github/build-canary-v3

@@ -1 +0,0 @@
-1

.github/build-nest-v3

@@ -1 +0,0 @@
-1

.github/release-canary-v3

@@ -1 +0,0 @@
-1

.github/release-nest-v3

@@ -1 +0,0 @@
-1

.github/workflows/build-canaryv3.yml

@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (Canary) (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-canary-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh

.github/workflows/build-nestv3.yml

@@ -1,37 +0,0 @@
-name: PikaOS Package Build Only (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/build-nest-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh

.github/workflows/release-canaryv3.yml

@@ -1,40 +0,0 @@
-name: PikaOS Package Build & Release (Canary) (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/release-canary-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:canaryv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
-
-    - name: Release Package
-      run: ./release.sh

.github/workflows/release-nestv3.yml

@@ -1,40 +0,0 @@
-name: PikaOS Package Build & Release (amd64-v3)
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/release-nest-v3'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/pikaos-linux/pikaos-builder:nestv3
-      volumes:
-        - /proc:/proc
-      options: --privileged -it
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install SSH key
-      uses: shimataro/ssh-key-action@v2
-      with:
-        key: ${{ secrets.SSH_KEY }}
-        name: id_rsa
-        known_hosts: ${{ secrets.KNOWN_HOSTS }}
-        if_key_exists: replace
-    
-    - name: Update APT Cache
-      run: apt-get update -y
-
-    - name: Set Build Config
-      run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
-
-    - name: Build Package
-      run: ./main.sh
-
-    - name: Release Package
-      run: ./release.sh

.github/workflows/release.yml

@@ -0,0 +1,40 @@
+name: PikaOS Package Release
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: self-hosted
+    container:
+      image: ubuntu:22.10
+      volumes:
+        - /proc:/proc
+      options: --privileged -it
+
+    steps:
+    - uses: actions/checkout@v3
+  
+    - name: Install needed packages
+      run: apt update && apt install software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar reprepro dpkg-sig devscripts -y
+
+    - name: Import GPG key
+      id: import_gpg
+      uses: crazy-max/ghaction-import-gpg@v5
+      with:
+        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+        passphrase: ${{ secrets.PASSPHRASE }}
+
+    - name: Install SSH key
+      uses: shimataro/ssh-key-action@v2
+      with:
+        key: ${{ secrets.SSH_KEY }}
+        name: id_rsa
+        known_hosts: ${{ secrets.KNOWN_HOSTS }}
+        if_key_exists: replace
+    
+    - name: Build Package
+      run: ./main.sh
+
+    - name: Release Package
+      run: ./release.sh

debian/changelog

@@ -1,15 +1,3 @@
-pika-wallpapers (1.3.0-101pika1) pika; urgency=medium
-
-  * Port to PikaOS 4
-
- -- Ward Nakchbandi <hotrod.master@hotmail.com>  Thu, 21 Apr 2017 13:20:00 -0600
-
-pika-wallpapers (1.3.0-99pika.lunar2) lunar; urgency=medium
-
-  * First release
-
- -- Jeremy Soller <jeremy@system76.com>  Thu, 21 Apr 2017 13:20:00 -0600
-
 pika-wallpapers (1.2.1) kinetic; urgency=medium
 
   * First release

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -1,8 +1,9 @@
 Source: pika-wallpapers
 Section: gnome
 Priority: optional
-Maintainer: Ward Nakchbandi <hotrod.master@hotmail.com>
+Maintainer: Jeremy Soller <jeremy@system76.com>
-Build-Depends: debhelper-compat (= 13)
+Uploaders: Ian Santopietro <ian@system76.com>
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.8
 Homepage: https://github.com/PikaOS-Linux/pkg-pika-wallpapers
 

debian/rules

@@ -7,9 +7,3 @@ export DEB_BUILD_OPTIONS = nocheck
 
 %:
 	dh $@
-
-
-override_dh_install:
-	dh_install
-	mkdir -p debian/pika-wallpapers/usr/share/wallpapers
-	ln -sf /usr/share/backgrounds/pika debian/pika-wallpapers/usr/share/wallpapers/pika

debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)

main.sh

@@ -1,21 +1,23 @@
 #! /bin/bash
 
-set -e
+DEBIAN_FRONTEND=noninteractive
-
-VERSION="1.3.0"
-
-source ./pika-build-config.sh
-
-echo "$PIKA_BUILD_ARCH" > pika-build-arch
 
+# Add dependent repositories
+wget -q -O - https://ppa.pika-os.com/key.gpg | sudo apt-key add -
+add-apt-repository https://ppa.pika-os.com
+add-apt-repository ppa:pikaos/pika
+add-apt-repository ppa:kubuntu-ppa/backports
 # Clone Upstream
-./gen-xml.sh
 mkdir -p ./pika-wallpapers
-cp -rvf ./* ./pika-wallpapers || true
+cp -rvf ./* ./pika-wallpapers || echo
 cd ./pika-wallpapers
 
+# Get build deps
+ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
+DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
+apt-get build-dep ./ -y
+
 # Build package
-LOGNAME=root dh_make --createorig -y -l -p pika-wallpapers_"$VERSION" || echo "dh-make: Ignoring Last Error"
 dpkg-buildpackage --no-sign
 
 # Move the debs to output

pika-build-config/amd64-v3.sh

@@ -1,10 +0,0 @@
-#! /bin/bash
-export PIKA_BUILD_ARCH="amd64-v3"
-export DEBIAN_FRONTEND="noninteractive"
-export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto=auto"
-export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
-export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
-export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
-export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto=auto"
-export DEB_BUILD_OPTIONS="nocheck notest terse"
-export DPKG_GENSYMBOLS_CHECK_LEVEL=0

pika-build-config/i386.sh

@@ -1,5 +0,0 @@
-#! /bin/bash
-export PIKA_BUILD_ARCH="i386"
-export DEBIAN_FRONTEND="noninteractive"
-export DEB_BUILD_OPTIONS="nocheck notest terse"
-export DPKG_GENSYMBOLS_CHECK_LEVEL=0

pika-wallpapers.xml

@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+	<wallpaper>
+		<name>adventurer_s_guild_by_neytirix_ddm554q.jpg</name>
+		<filename>/usr/share/backgrounds/pika/adventurer_s_guild_by_neytirix_ddm554q.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>and_then_at_the_crossroads___by_neytirix_ddnv6qx.jpg</name>
+		<filename>/usr/share/backgrounds/pika/and_then_at_the_crossroads___by_neytirix_ddnv6qx.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>are_you_lost__by_neytirix_ddx4x55.jpg</name>
+		<filename>/usr/share/backgrounds/pika/are_you_lost__by_neytirix_ddx4x55.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>bit_higher__by_neytirix_ddcvgxk.jpg</name>
+		<filename>/usr/share/backgrounds/pika/bit_higher__by_neytirix_ddcvgxk.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>bunny_butts_by_neytirix_dcrymvg.jpg</name>
+		<filename>/usr/share/backgrounds/pika/bunny_butts_by_neytirix_dcrymvg.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>can_i_come_in__by_neytirix_ddoss9c.jpg</name>
+		<filename>/usr/share/backgrounds/pika/can_i_come_in__by_neytirix_ddoss9c.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>don_t_be_scared__pokemon_fanart__by_neytirix_daf7e1e.jpg</name>
+		<filename>/usr/share/backgrounds/pika/don_t_be_scared__pokemon_fanart__by_neytirix_daf7e1e.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>duck_village_by_neytirix_dekbu6y.jpg</name>
+		<filename>/usr/share/backgrounds/pika/duck_village_by_neytirix_dekbu6y.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>excuse_me_sir_by_neytirix_ddfrrtv.jpg</name>
+		<filename>/usr/share/backgrounds/pika/excuse_me_sir_by_neytirix_ddfrrtv.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>farewell_by_neytirix_ddl6d9g.jpg</name>
+		<filename>/usr/share/backgrounds/pika/farewell_by_neytirix_ddl6d9g.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>flee_puny_mortals_fleeeee__by_neytirix_desjf2j.jpg</name>
+		<filename>/usr/share/backgrounds/pika/flee_puny_mortals_fleeeee__by_neytirix_desjf2j.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>guardian_of_the_beetroot_by_neytirix_ddgl0np.jpg</name>
+		<filename>/usr/share/backgrounds/pika/guardian_of_the_beetroot_by_neytirix_ddgl0np.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>guard_it_well_okay__by_neytirix_ddcc1wt.jpg</name>
+		<filename>/usr/share/backgrounds/pika/guard_it_well_okay__by_neytirix_ddcc1wt.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>heading_home_by_neytirix_dfljvk0.jpg</name>
+		<filename>/usr/share/backgrounds/pika/heading_home_by_neytirix_dfljvk0.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>i_got_you_buddy_by_neytirix_ddb99v0.jpg</name>
+		<filename>/usr/share/backgrounds/pika/i_got_you_buddy_by_neytirix_ddb99v0.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>i_hope_all_your_wool_is_forever_soggy_by_neytirix_ddbndi8.jpg</name>
+		<filename>/usr/share/backgrounds/pika/i_hope_all_your_wool_is_forever_soggy_by_neytirix_ddbndi8.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>i_need_your_guidance_by_neytirix_ddg4u73.jpg</name>
+		<filename>/usr/share/backgrounds/pika/i_need_your_guidance_by_neytirix_ddg4u73.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>king_chonk_of_azotis_by_neytirix_df2dcte.jpg</name>
+		<filename>/usr/share/backgrounds/pika/king_chonk_of_azotis_by_neytirix_df2dcte.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>munch_munch_by_neytirix_de496s8.jpg</name>
+		<filename>/usr/share/backgrounds/pika/munch_munch_by_neytirix_de496s8.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>on_duty_by_neytirix_ddff7cy.jpg</name>
+		<filename>/usr/share/backgrounds/pika/on_duty_by_neytirix_ddff7cy.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>passing_through_by_neytirix_ddsr4g2.jpg</name>
+		<filename>/usr/share/backgrounds/pika/passing_through_by_neytirix_ddsr4g2.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>quick__he_ll_be_back_soon__by_neytirix_ddk5xi6.jpg</name>
+		<filename>/usr/share/backgrounds/pika/quick__he_ll_be_back_soon__by_neytirix_ddk5xi6.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>shh__they_ll_hear_us__by_neytirix_dde48us.jpg</name>
+		<filename>/usr/share/backgrounds/pika/shh__they_ll_hear_us__by_neytirix_dde48us.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>the_mooshroom_by_neytirix_deyzsx6.jpg</name>
+		<filename>/usr/share/backgrounds/pika/the_mooshroom_by_neytirix_deyzsx6.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>too_late_to_negotiate_by_neytirix_ddbyu2k.jpg</name>
+		<filename>/usr/share/backgrounds/pika/too_late_to_negotiate_by_neytirix_ddbyu2k.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>wanna_join_our_party__by_neytirix_de1fia1.jpg</name>
+		<filename>/usr/share/backgrounds/pika/wanna_join_our_party__by_neytirix_de1fia1.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>why_s_it_not_going__by_neytirix_dds3mtw.jpg</name>
+		<filename>/usr/share/backgrounds/pika/why_s_it_not_going__by_neytirix_dds3mtw.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+	<wallpaper>
+		<name>yurtle_s_travelling_pot_shop_by_neytirix_dfb2d8o.jpg</name>
+		<filename>/usr/share/backgrounds/pika/yurtle_s_travelling_pot_shop_by_neytirix_dfb2d8o.jpg</filename>
+		<options>zoom</options>
+		<pcolor>#000000</pcolor>
+		<scolor>#000000</scolor>
+		<shade_type>solid</shade_type>
+	</wallpaper>
+</wallpapers>

release.sh

@@ -1,2 +1,11 @@
-# send debs to server
+# Sign the packages
-rsync -azP --include './' --include '*.deb' --exclude '*' ./output/ ferreo@direct.pika-os.com:/srv/www/cockatiel-incoming/
+dpkg-sig --sign builder ./output/*.deb
+
+# Pull down existing ppa repo db files etc
+rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo
+
+# Add the new package to the repo
+reprepro -V --basedir ./output/repo/ includedeb kinetic ./output/*.deb
+
+# Push the updated ppa repo to the server
+rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/