Mercurial > hg > pub > prymula > scripts

changeset 17:3b8fd6a7f2d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bing4desktop-0.240207-2
author prymula <prymula76@outlook.com>
date Wed, 07 Feb 2024 12:11:34 +0100
parents 2dea5bff9c0c
children a1a885c59d88
files bing4desktop/Changelog.txt bing4desktop/DEBIAN/bing4desktop.dsc bing4desktop/DEBIAN/debian.changelog bing4desktop/DEBIAN/debian.control bing4desktop/Makefile bing4desktop/Makefile.aur bing4desktop/PKG/PKGBUILD bing4desktop/RPM/bing4desktop.spec bing4desktop/bing4desktop.py
diffstat 9 files changed, 37 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/bing4desktop/Changelog.txt	Tue Feb 06 20:03:52 2024 +0100
+++ b/bing4desktop/Changelog.txt	Wed Feb 07 12:11:34 2024 +0100
@@ -1,3 +1,5 @@
+0.240207-2 - Poprawilem nadpisywanie treści powiadomienia przez zdjęcia w podglądzie
+0.240207-0 - Poprawki niedociągnięć w Makefile.aur
 0.240206-3 - Skrypty instalacyjne
 0.240206-0 - Miał być przełom a skończyło się na kosmetyce
 0.240205-4 - Przetwarzanie zdjęć w katalogu tymczasowym, buildy dla Arch, Fedory i Thumbleweed
--- a/bing4desktop/DEBIAN/bing4desktop.dsc	Tue Feb 06 20:03:52 2024 +0100
+++ b/bing4desktop/DEBIAN/bing4desktop.dsc	Wed Feb 07 12:11:34 2024 +0100
@@ -5,19 +5,19 @@
 Source: bing4desktop
 Binary: bing4desktop
 Architecture: all
-Version: 0.240206-4
+Version: 0.240207-2
 Maintainer: Przemysław R. Pietraszczyk <prymula76@outlook.com>
 Homepage: http://prymula.ct8.pl
 
-DEBTRANSFORM-TAR: bing4desktop-0.240206-4.tar.gz
+DEBTRANSFORM-TAR: bing4desktop-0.240207-2.tar.gz
  
 Standards-Version: 4.6.2.0
-Build-Depends: debhelper-compat (>= 12), python3-all, dh-python, python3-pillow, python3-requests, python3-tk, python3-pystray, distutils, fakeroot
+Build-Depends: debhelper-compat (>= 12), python3-all | python3, dh-python, python3-pillow, python3-requests, python3-tk, python3-pystray, fakeroot
 Package-List:
- verysimpleslideshow deb x11 optional arch=all
+ bing4desktop deb x11 optional arch=all
 Files:
- b31649bc23b2b7bca9ab70ea3410711a 128820 bing4desktop-0.240206-4.tar.gz
- 29e7e7e60bc81891e3da3871b9eeb549 764 bing4desktop-0.240206-4.debian.tar.gz
+ b31649bc23b2b7bca9ab70ea3410711a 128820 bing4desktop-0.240207-2.tar.gz
+ 29e7e7e60bc81891e3da3871b9eeb549 764 bing4desktop-0.240207-2.debian.tar.gz
 
 -----BEGIN PGP SIGNATURE-----
 
--- a/bing4desktop/DEBIAN/debian.changelog	Tue Feb 06 20:03:52 2024 +0100
+++ b/bing4desktop/DEBIAN/debian.changelog	Wed Feb 07 12:11:34 2024 +0100
@@ -1,3 +1,9 @@
+bing4desktop (0.240207-2) unstable; urgency=low
+
+  * Last release
+
+ -- Przemysław R. Pietraszczyk  Wed, 7 Feb 2024 11:53:00 +0200
+
 bing4desktop (0.240206-0) unstable; urgency=low
 
   * Last release
--- a/bing4desktop/DEBIAN/debian.control	Tue Feb 06 20:03:52 2024 +0100
+++ b/bing4desktop/DEBIAN/debian.control	Wed Feb 07 12:11:34 2024 +0100
@@ -2,12 +2,11 @@
 Section: python
 Priority: extra
 Maintainer: Przemysław R. Pietraszczyk
-Build-Depends: debhelper-compat (= 12), python3-all, dh-python, python3-pillow, python3-requests, python3-tk, python3-pystray, distutils, fakeroot
+Build-Depends: debhelper-compat (= 12), python3-all | python3, dh-python, python3-pillow, python3-requests, python3-tk, python3-pystray, fakeroot
 Standards-Version: 4.6.2.0
 Homepage: http://prymula.ct8.pl
 
-
 Package: bing4desktop
 Architecture: all
-Depends: ${misc:Depends}, python3-all, python3-pillow, python3-requests
-Description: CLI script for creating slideshows 
+Depends: ${misc:Depends}, python3-all | python3, python3-pillow, python3-requests, python3-tk, python3-pystray
+Description: Beautify your desktop with photos from Bing search engine
--- a/bing4desktop/Makefile	Tue Feb 06 20:03:52 2024 +0100
+++ b/bing4desktop/Makefile	Wed Feb 07 12:11:34 2024 +0100
@@ -1,5 +1,4 @@
 prefix=/usr
-MYDIR=/home
 
 install: bing4desktop.py
 	mkdir -pm 0755 $(prefix)/bin
--- a/bing4desktop/Makefile.aur	Tue Feb 06 20:03:52 2024 +0100
+++ b/bing4desktop/Makefile.aur	Wed Feb 07 12:11:34 2024 +0100
@@ -1,9 +1,9 @@
 prefix=/usr
-#MYDIR=/home
 
 install: bing4desktop.py
 	mkdir -pm 0755 $(DESTDIR)$(prefix)/bin
 	mkdir -pm 0755 $(DESTDIR)$(prefix)/share/bing4desktop
+	mkdir -pm 0755 $(DESTDIR)$(prefix)/share/applications
 	mkdir -pm 0755 $(DESTDIR)/etc/xdg/autostart
 	install -m 0755 bing4desktop.py $(DESTDIR)$(prefix)/bin
 	install -m 0644 bing.ico $(DESTDIR)$(prefix)/share/bing4desktop
--- a/bing4desktop/PKG/PKGBUILD	Tue Feb 06 20:03:52 2024 +0100
+++ b/bing4desktop/PKG/PKGBUILD	Wed Feb 07 12:11:34 2024 +0100
@@ -1,8 +1,8 @@
 # Maintainer: Przemyslaw R. Pietraszczyk <prymula76@outlook.com>
 
 pkgname=bing4desktop
-pkgver=0.240206
-pkgrel=4
+pkgver=0.240207
+pkgrel=2
 pkgdesc="Beautify your desktop with photos from Bing search engine"
 arch=('any')
 url="prymula.ct8.pl"
@@ -13,7 +13,7 @@
 makedepends=('python' 'python-pillow' 'python-requests' 'tk')
 source=(${pkgname}-${pkgver}-${pkgrel}.tar.gz)
 noextract=()
-sha256sums=('4da4cf3dbb3f0b1028cad1b5be12a2878b6c5151d8f08b6380fcbc001b54fbed') #generate with 'makepkg -g' || sha256sum
+sha256sums=('45ff8acee60441dd0e938ab231228250dd3927683de88e91ca890bf873e55d71') #generate with 'makepkg -g' || sha256sum
 
 #build() {
 	#cd "$srcdir/${pkgname}-${pkgver}-${pkgrel}"
--- a/bing4desktop/RPM/bing4desktop.spec	Tue Feb 06 20:03:52 2024 +0100
+++ b/bing4desktop/RPM/bing4desktop.spec	Wed Feb 07 12:11:34 2024 +0100
@@ -15,10 +15,10 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-%define unmangled_version 0.240206-4
+%define unmangled_version 0.240207-2
 Name:       bing4desktop
-Version:	0.240206
-Release:    4
+Version:	0.240207
+Release:    2
 Summary:	Beautify your desktop with photos from Bing search engine
 License:	Public Domain
 URL:		https://prymula.ct8.pl
--- a/bing4desktop/bing4desktop.py	Tue Feb 06 20:03:52 2024 +0100
+++ b/bing4desktop/bing4desktop.py	Wed Feb 07 12:11:34 2024 +0100
@@ -22,14 +22,16 @@
 import shutil
 import glob
 
-ver = "0.240206-4"
+ver = "0.240207-2"
 
 BING_URI_BASE = "http://www.bing.com"
 BING_WALLPAPER_PATH = "/HPImageArchive.aspx?format=js&idx=1&n=1&mkt=en-US"
 full_path=""
-actualImage = -1
+actualImage = 1
 COPYRIGHT_TXT = ""
 TITLE = ""
+TMP_COPYRIGHT = ""
+TMP_TITLE = ""
 
 tmp_path =  tempfile.mkdtemp()
 
@@ -72,9 +74,12 @@
         return True
         
     def set(self,file_loc, first_run):
-        global full_path
+        global full_path, TMP_COPYRIGHT, COPYRIGHT_TXT, TMP_TITLE, TITLE
         desktop_env = os.environ.get('DESKTOP_SESSION')
 
+        TMP_COPYRIGHT = COPYRIGHT_TXT
+        TMP_TITLE = TITLE
+
         if len(full_path) == 0:
             messagebox.showinfo("Błąd","Niewybrano obrazu, najpierw wybierz obraz")
             return
@@ -175,7 +180,7 @@
 
 
 class Gui():
-    global COPYRIGHT_TXT, TITLE
+    global TMP_COPYRIGHT, TMP_TITLE
     
     def __init__(self):
         self.window = tk.Tk()
@@ -194,7 +199,7 @@
             item("Ustaw Tapetę", lambda icon, item: wp.set(full_path, True)),
             item('Tapeta poprzednia', lambda icon, item: self.change_pic(1)),
             item('Tapeta następna', lambda icon, item: self.change_pic(-1)),
-            item('Opis zdjęcia', lambda icon, item: icon.notify(TITLE + ' --- ' + COPYRIGHT_TXT)),
+            item('Opis zdjęcia', lambda icon, item: icon.notify(TMP_TITLE + ' --- ' + TMP_COPYRIGHT)),
             item('O Programie', lambda icon, item: self.about()),
 
             item('Wyjdź', self.quit_window)
@@ -220,11 +225,11 @@
         global actualImage, BING_WALLPAPER_PATH
         BASE = "/HPImageArchive.aspx?format=js&idx="
         OFF = "&n=1&mkt=en-US"
-
+        
         actualImage = actualImage + n;
         if (actualImage < 0):
-             actualImage = 10
-        elif (actualImage > 10):
+             actualImage = 7
+        elif (actualImage > 7):
              actualImage = 0
              
         wp=WPaper()