aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.editorconfig13
-rw-r--r--.gitignore115
-rw-r--r--contrib/redshift.spec4
3 files changed, 101 insertions, 31 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..a365f4d
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 8
+
+[*.m]
+indent_style = space
+indent_size = 2
+
+[*.py]
+indent_style = space
+indent_size = 4
diff --git a/.gitignore b/.gitignore
index 077bca2..d56a6b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,29 @@
-# Hidden files
-.*
-!.git*
-
-# Backup files
*~
-\#*\#
+
+## From: https://github.com/github/gitignore/blob/master/C.gitignore
+# Prerequisites
+*.d
# Object files
*.o
*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
# Libraries
*.lib
*.a
+*.la
+*.lo
# Shared objects (inc. Windows DLLs)
*.dll
@@ -24,42 +35,86 @@
*.exe
*.out
*.app
-#src/redshift*
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
+
+## From: https://github.com/github/gitignore/blob/master/Autotools.gitignore
+# http://www.gnu.org/software/automake
-# autotools
-/autom4te.cache
Makefile.in
-Makefile
-stamp-h1
-/config.*
-/ABOUT-NLS
+/ar-lib
+/mdate-sh
+/py-compile
+/test-driver
+/ylwrap
+
+# http://www.gnu.org/software/autoconf
+
+autom4te.cache
+/autoscan.log
+/autoscan-*.log
/aclocal.m4
+/compile
+/config.guess
+/config.h.in
+/config.log
+/config.status
+/config.sub
/configure
+/configure.scan
/depcomp
/install-sh
/missing
-/py-compile
-/compile
-*.deps/
-/m4/
-libtool
-ltmain.sh
+/stamp-h1
+# https://www.gnu.org/software/libtool/
+
+/ltmain.sh
+
+# http://www.gnu.org/software/texinfo
+
+/texinfo.tex
+
+# http://www.gnu.org/software/m4/
+
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+
+## Redshift specific:
# generated files
-src/redshift-gtk/defs.py
-src/redshift-gtk/redshift-gtk
-contrib/redshift.spec
-src/redshift
-src/redshift-gtk/__pycache__/
-/data/systemd/redshift.service
-/data/systemd/redshift-gtk.service
+/ABOUT-NLS
+/config.rpath
+/contrib/redshift.spec
+/data/apparmor/usr.bin.redshift
/data/appdata/redshift-gtk.appdata.xml
/data/applications/redshift.desktop
/data/applications/redshift-gtk.desktop
-/data/apparmor/usr.bin.redshift
-
-*.su
-*.gch
+/data/systemd/redshift.service
+/data/systemd/redshift-gtk.service
+/m4
+/src/redshift
+/src/redshift-gtk/defs.py
+/src/redshift-gtk/redshift-gtk
+/src/redshift-gtk/__pycache__/
# gettext
/po/POTFILES
diff --git a/contrib/redshift.spec b/contrib/redshift.spec
index 7159c1e..475aa66 100644
--- a/contrib/redshift.spec
+++ b/contrib/redshift.spec
@@ -1,5 +1,5 @@
Name: redshift
-Version: 1.11
+Version: 1.12
Release: 1%{dist}
Summary: Adjusts the color temperature of your screen according to time of day
Group: Applications/System
@@ -83,6 +83,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/appdata/redshift-gtk.appdata.xml
%changelog
+* Sun Jul 8 2018 Ben van der Harg <benvanderharg@yandex.com> - 1.12.1
+- Update to 1.12
* Sat Jan 2 2016 Jon Lund Steffensen <jonlst@gmail.com> - 1.11-1
- Update to 1.11