Update README.md

Make it a native package again

See merge request librem5-apps/librem5-goodies!25

Makefile

@@ -5,7 +5,7 @@ APPDATA = \
 all: shell-check appstream-check
 
 shell-check:
-	shellcheck l5-contacts-importer l5-screenshot l5-scale-the-screen
+	shellcheck l5-contacts-importer l5-screenshot l5-screen-recorder
 
 appstream-check:
 	appstream-util validate-relax $(APPDATA)

README.md

@@ -1,10 +1,12 @@
 # Librem 5 Goodies
 
-This project serves to create a deb package with several bash scripts created for the Librem 5 phone.
+This project serves to create a deb package with several temporary helper bash scripts created for the Librem 5 phone. 
 
 Bring your script here and it might be packaged :tada:
 
-Please Avoid scripts that require cloning and building packages from source.
+Please avoid scripts that require cloning and building packages from source.
+
+When one of these temporary helper scripts is no longer considered necessary, it will be removed (say if features provided by the script in question are added to `phosh`).
 
 #### Scripts added to this package:
 
@@ -14,13 +16,16 @@ Please Avoid scripts that require cloning and building packages from source.
 |:--:|:--:|:--:|:--:|
 |Contacts Importer| Allows to import contacts from a vcard file to GNOME Contacts. Can work with a UI and from command line interface|`yad`, `syncevolution`, `libnotify-bin`, `Evolution Data Server`| This script will be removed from this paclage when the version of GNOME-Contacts available in PureOS supports importing contacts from a vcard file. |
 |Screenshot| Allows to take screenshots in the Librem 5 phone|`yad`, `grim`, `libnotify-bin`, `xdg-user-dirs`| This script will be removed from this package when there is a native app that can take screenshots in `Phosh`. |
-|Scale the screen| A simple application to scale the screen| `wlr-randr`, `yad` | This script will be removed from this package when `phosh` has better support for screen scaling.|
+|Screen recorder | A simple application to record the screen| `wf-recorder`, `yad`, `libnotify-bin` | This script will be removed from this package when `phosh` has better support for recording.|
 
+**Previously removed scripts:**
 
+- Scale the screen: A simple application to scale the screen. This is now supported in `phosh`.
 
 #### Adding a script to this package:
 
-- Make a new branch based on the master branch and work from it.
-- Make a merge request
+- Make a new branch based on the `pureos/latest` branch and work from it.
+- Make a merge request.
 - Avoid scripts that download and build source code. If you need a dependency not available in PureOS, package it :D
+- If your script stores files somewhere, then please use `xdg-user-dir` to set the path instead of harcoding directory names like "Documents", "Videos", this is usefull because not all users have their OS in English. See example here; https://source.puri.sm/librem5-apps/librem5-goodies/-/blob/pureos/byzantium/l5-screenshot#L27 `xdg-user-dir` is also quite usefull
 - if you are not confortable in commiting to a Deb package then open an issue asking for the script to be packaged and we will work it out

debian/changelog

@@ -1,3 +1,46 @@
+librem5-goodies (0.0.7pureos1) byzantium; urgency=medium
+
+  [ Guido Günther ]
+  * Make it a native package again.
+    There's no upstream other than us afaik.
+  * ci: Drop check-tarball.
+    Not needed (and hence not working) for a 3.0 (native) package
+
+ -- Guido Günther <agx@sigxcpu.org>  Sat, 30 Oct 2021 15:40:47 +0200
+
+librem5-goodies (0.0.7-1pureos2) byzantium; urgency=medium
+
+  [ João Azevedo ]
+  * Prepare release to byzantium.
+      - Update CI
+      - New release number 
+      - Increase debhelper version to 13
+
+ -- João Azevedo <joao.azevedo@puri.sm>  Sat, 30 Oct 2021 00:36:54 +0200
+
+librem5-goodies (0.0.7pureos1) amber-phone; urgency=medium
+  
+  [ João Azevedo ]
+  * New upstream release.
+      - Remove scale the screen script, closes #15
+      - Remove wl-randr as a dependency as it is no longer required
+      - Update packge discription to include l5-screen-recorder
+      - Update appdata file to include the l5-screen-recorder
+      - Add l5-screen-recorder to makefile build tests
+      - Fix shellcheck warning with l5-screen-recorder
+      - Add usage function to l5-screen-recorder
+      - Add l5-screen-recorder icon to notifications
+      - Add l5-screen-recorder to build tests
+      - Update debhelper version
+      
+  [ David Hamner ] 
+  * Add l5-screen-recorder:
+      - Add l5-screen-recorder script and l5-screen-recorder desktop file
+      - Add wf-recorder as a dependency required by l5-screen-recorder
+      - Add paths for l5-screen-recorder in librem5-goodies.install file
+      
+ -- João Azevedo <joao.azevedo@puri.sm>  Fri, 29 Oct 2021 23:28:46 +0200
+
 librem5-goodies (0.0.6pureos1) amber-phone; urgency=medium
 
   * Non-maintainer upload.

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: João Azevedo <joao.azevedo@puri.sm>
 Build-Depends:
  appstream-util,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  shellcheck,
 Homepage: https://source.puri.sm/librem5-apps/librem5-goodies
 Vcs-Git: https://source.puri.sm/librem5-apps/librem5-goodies.git
@@ -20,7 +20,7 @@ Depends:
  syncevolution,
  yad,
  xdg-user-dirs,
- wlr-randr,
+ wf-recorder,
  ${misc:Depends},
 Description: Librem 5 Goodies
  A collection of bash scripts and applications made to add functionalities to
@@ -28,4 +28,4 @@ Description: Librem 5 Goodies
   - L5 Contacts Importer: A simple application to import contacts from a vcard
     file to GNOME Contacts.
   - L5 Screenshot: A simple application to make screenshots on the Librem 5
-  - L5 Scale the screen: A simple application to scale the Librem 5 screen
+  - L5 Screen Recorder: A simple application to record the Librem 5 screen

debian/librem5-ci.yml

@@ -1,12 +1,9 @@
 include:
  - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
- - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-amber-jobs.yml'
-
-before_script:
-   - echo "deb http://repo.pureos.net/pureos amber-phone main" >> /etc/apt/sources.list.d/amber-phone.list
-   - apt-get update
+ - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-byzantium-jobs.yml'
 
 stages:
  - package
  - test-package
 
+

debian/librem5-goodies.install

@@ -2,6 +2,6 @@ l5-contacts-importer /usr/bin
 l5-contacts-importer.desktop /usr/share/applications
 l5-screenshot /usr/bin
 l5-screenshot.desktop /usr/share/applications
-l5-scale-the-screen /usr/bin
-l5-scale-the-screen.desktop /usr/share/applications
+l5-screen-recorder /usr/bin
+l5-screen-recorder.desktop /usr/share/applications
 sm.puri.librem5.goodies.appdata.xml /usr/share/metainfo

debian/tests/control

@@ -1,3 +1,3 @@
-Test-Command: /usr/bin/l5-contacts-importer --help && /usr/bin/l5-screenshot --help && /usr/bin/l5-scale-the-screen --help
+Test-Command: /usr/bin/l5-contacts-importer --help && /usr/bin/l5-screenshot --help && l5-screen-recorder --help
 Restrictions: superficial
 Depends: librem5-goodies

gbp.conf

@@ -0,0 +1,9 @@
+[DEFAULT]
+debian-branch = pureos/byzantium
+debian-tag = pureos/%(version)s
+upstream-tag = v%(version)s
+upstream-branch = master
+pristine-tar = True
+
+[tag]
+sign-tags = True

l5-scale-the-screen

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-function usage()
-{
-  echo "Usage: $0, or just press the Scale the Screen Icon in the app tray"
-  exit 0
-}
-
-case "$1" in
-   --help|-h|-?)
-     usage
-   ;;
-esac
-
-DISPLAY=$(wlr-randr | head -n 1 | awk '{print $1}')
-
-yad --title scale_screen --form \
-  --field='Default dpi (2x scale)':fbtn "wlr-randr --output $DISPLAY --scale 2" \
-  --field='Low dpi (1.75x scale)!window-restore-symbolic':fbtn "wlr-randr --output $DISPLAY --scale 1.75" \
-  --field='Medium dpi (1.5x scale)!window-minimize-symbolic':fbtn "wlr-randr --output $DISPLAY --scale 1.5" \
-  --field='High dpi (1.25x scale)!window-maximize-symbolic':fbtn "wlr-randr --output $DISPLAY --scale 1.25" \
-  --field='Max dpi (1x scale)!view-fullscreen-symbolic':fbtn "wlr-randr --output $DISPLAY --scale 1" \
-  --field='Restart Phosh':fbtn "sudo systemctl restart phosh" \
-  --button='Close!gtk-cancel':1

l5-screen-recorder

@@ -0,0 +1,40 @@
+#!/bin/bash
+# GPL3
+
+function usage()
+{
+  echo "Usage: Just press the Screen Shot Icon in the app tray"
+  exit 0
+}
+
+NOTIFY_SEND="notify-send -i emblem-videos-symbolic"
+
+case "$1" in
+   --help|-h|-?)
+     usage
+   ;;
+esac
+
+VIDEO="$(xdg-user-dir VIDEOS)/$(date +%Y-%m-%d-%H%M%S).avi"
+yad --title ScreenCapture --text "A simple GUI to record the screen" --button="Start capture:100" --button="Quit:0" --buttons-layout=center
+start_window_return=$?
+
+if [[ $start_window_return -eq 100 ]]
+then
+    wf-recorder -a -f "$VIDEO" --codec=asv1 &
+else
+    exit
+fi
+
+yad --title ScreenCapture --text "Screen capture is actively running. \\nFile: $VIDEO" --button='Stop capture:100' --buttons-layout=center
+exit_window_return=$?
+
+if [[ $exit_window_return -eq 100 ]]
+then
+    killall -2 wf-recorder
+fi
+
+if test -f "$VIDEO"
+then
+    $NOTIFY_SEND ScreenCapture "Video stored at $VIDEO"
+fi

l5-screen-recorder.desktop

@@ -1,9 +1,8 @@
 [Desktop Entry]
-Name=Scale Screen
+Name=Screen Recorder
 Type=Application
-Icon=video-display-symbolic
-Exec=/usr/bin/l5-scale-the-screen %U
+Icon=emblem-videos-symbolic
+Exec=/usr/bin/l5-screen-recorder
 Categories=Utility;
 # Translators: Do NOT translate or transliterate this text (these are enum types)!
 X-Purism-FormFactor=Workstation;Mobile;
-

sm.puri.librem5.goodies.appdata.xml

@@ -11,7 +11,7 @@
     <p>Librem5 Goodies contains the following scripts:</p>
     <p>- Contacts importer: An application to import contacts from a vcard</p> 
     <p>- Screen Shot: An application to make screenshots of the Librem 5</p>
-    <p>- Scale the Screen: An application to scale the Librem 5 screen</p>
+    <p>- Screen recorder: An application to record the Librem 5 screen</p> 
   </description>
   <url type="homepage">https://source.puri.sm/librem5-apps/librem5-goodies/</url>
   <developer_name>Purism Developers</developer_name>