[redeclipse] 171/494: rename and add personal notes and todo:s

Sun Jun 21 20:52:29 UTC 2015

This is an automated email from the git hooks/post-receive script.

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit b269f11cecf671c926643b8123dd4bab7da64ea4
Author: Arand Nash <ienorand at gmail.com>
Date:   Sun Apr 17 19:47:44 2011 +0100

    rename and add personal notes and todo:s
---
 01_suggestions                                    |  25 +++++
 02_licensing                                      |  77 ++++++++++++++
 unincluded_copyrights => 03_unincluded_copyrights |   0
 cleaning_copyrights => 04_cleaning_copyrights     |   0
 05_git_workflow                                   | 121 ++++++++++++++++++++++
 5 files changed, 223 insertions(+)

diff --git a/01_suggestions b/01_suggestions
new file mode 100644
index 0000000..388ebe5
--- /dev/null
+++ b/01_suggestions
@@ -0,0 +1,25 @@
+Feature Requests:
+* Use RE_DIR=$(dirname $0) in script to allow executing script from anywhere
+* Neither ~ nor / seems to work properly on a non US keyboard, t does though,
+  or rebinding...
+* Make it possible to stop RE from creating the folder in the homedir, logically
+  using -h
+
+* Using K before you have reached the first checkpoint doesn't reset timer
+  - Use home instead
+
+Features Requsted:
+* Ability to permanently disable keybindings via ingame editing
+  (basically by writing a bind << "KEY" [""] >> line in the config.cfg)
+  - The restoring of default values is a feature for click-happy noobs
+* Bug Mike about why the prebuild linux client doesn't work on OpenSUSE
+  - Bugged, no idea why, can't really do much apart from ask all users to
+    recompile
+  - Is it the links to /lib/ld-linux-x86-64.so.2 that aint working here?
+    http://forum.freegamedev.net/viewtopic.php?f=53&t=1331
+* Don't use the sword in time trial
+  - Empty hands looked gayer
+
+Features Implemented:
+* Make is so that the local client server does not parse servinit and servexec
+  - r2459: Now uses localinit & localexec
diff --git a/02_licensing b/02_licensing
new file mode 100644
index 0000000..cc7f72f
--- /dev/null
+++ b/02_licensing
@@ -0,0 +1,77 @@
+* ICC colour profiles of jpegs/pngs
+  - Is it ok to strip these?
+    + jhead -purejpg
+    + mogrify -strip
+
+* sampling+
+
+* Enet has a lot of GPL2+/FSF-free, Would it be possible to redistribute these
+  items under Expat instead, as per the libtool/autoconf license exception, it
+  would make things much neater.
+
+* Font (currently breaking it's stated license)
+  - Generated font png:s (unclear what can be done with them: "used in project
+    for free", what does that mean?)
+    + Would the author be willing to relicense/clarify this?
+  - Are the other fonts CC-BY-SA RE-Team? (As would be implied by current
+    license setup.)
+    + Would it be possible to use these instead of the akashi font to get rid of
+      that licensing issue?
+  - Alternatively using a completely different, free font
+
+* src/include/wincompat.h is ARR, do you have permission to distribute this
+  file? And what the heck is it for anyways?
+
+* Is it ok to strip these from the tarballs we distribute (don't need to bother
+  about all the embedded licenses)?:
+  src/include
+  src/lib
+  src/install	(only in svn)
+  src/excode	(only in svn)
+  bin/[selection]
+  few more bits...
+  - It would be even better if they were stripped from the Linux/BSD tarball
+    completely, since it makes little sense to keep it there ;)
+
+Wishlist:
+
+* Relicense under something like this:
+
+ Limited rights are granted to:
+ * Redistribute verbatim copies of the entire distribution.
+ * Redistribute modified versions, plainly marked as such, of the entire
+   distribution which may be:
+   - Recompressed using different archival formats (zip/tgz/deb/dmg/...).
+   - Reorganised in order to conform to the organisation scheme of a target OS
+     (including splitting the distribution into parts {e.g. -client -server
+     -data}).
+   - Stripped of items which are not relevant to the target OS.
+   - Accompanied by patches for the purpose of modifying the program at build
+     time.
+   - Recompiled, possibly using patches modifying the program at build time,
+     for the target OS.
+ Any changes beyond this will result in a modified version which:
+ * Must conform to all individual licenses for the material included.
+ * Is NOT to be considered the Red Eclipse Project.
+
+ The Red Eclipse trademarks (name, logos, advertising/promotional material, or
+ modified versions thereof) may be used by anyone to refer to the Red Eclipse
+ Project, but does not indicate endorsement by the project.
+ Use for any other reason is strictly prohibited without express written consent
+ of the Red Eclipse Team.
+
+
+
+
+
+
+ Limited rights are granted to use the Red Eclipse logos, trademarks, or other
+ advertising/promotional material:
+    * When used in conjunction with a Red Eclipse article, comment, review, or
+      advertisement, regardless of the media featured in said material.
+    * In conjunction with redistribution of the game, provided it is done
+      according to the terms above.
+
+* Alternatively find a way to apply a popular license to the whole project.
+
+* Allow for the logo and name to be used also under above terms.
diff --git a/unincluded_copyrights b/03_unincluded_copyrights
similarity index 100%
rename from unincluded_copyrights
rename to 03_unincluded_copyrights
diff --git a/cleaning_copyrights b/04_cleaning_copyrights
similarity index 100%
rename from cleaning_copyrights
rename to 04_cleaning_copyrights
diff --git a/05_git_workflow b/05_git_workflow
new file mode 100644
index 0000000..6edb249
--- /dev/null
+++ b/05_git_workflow
@@ -0,0 +1,121 @@
+==PPA_CLEAN PACKAGE==
+
+git checkout svn
+git svn rebase
+export VERSION=$(git svn info | sed -n 's/Last\ Changed\ Rev:\ \([0-9]*\)/\1/p')
+export PPA_VERSION=1.01+svn$VERSION-ppa1
+
+git checkout clean
+git merge svn
+git rm -r bin/
+git commit
+
+git checkout debian_clean
+git merge clean
+git merge debian
+
+git checkout ppa_clean
+git merge debian_clean
+
+git-dch --release --auto --new-version=$PPA_VERSION --debian-branch=ppa_clean
+git commit -am "Changelog for r$VERSION PPA release"
+git tag $PPA_VERSION
+
+git-buildpackage -j2 -us -uc --git-debian-branch=ppa_clean --git-upstream-branch=clean
+sudo dpkg -i ../redeclipse*"$PPA_VERSION"*.deb
+git-buildpackage clean --git-debian-branch=ppa_clean --git-upstream-branch=clean; quilt pop -a
+# git reset --hard && git clean -df
+git-buildpackage -j2 -sa -S --git-debian-branch=ppa_clean --git-upstream-branch=clean
+dput resvn ../redeclipse_"$PPA_VERSION"_source.changes
+
+
+==IMAGE CLEANING==
+
+find . -iname *.jpg | xargs grep -irl copyright
+
+for i in $(find . -iname *.jpg | xargs grep -irl copyright); do jhead -purejpg $i; done
+
+for i in $(find . -iname *.png); do if [ -n "$(identify -verbose "$i" | grep 'Profile.*bytes')" ]; then echo $i; fi; done | sed s/^..//
+
+for i in $(git show debian:debian/unincluded_copyrights | egrep '.*\.png'); do echo mogrify -strip $i; mogrify -strip $i; done
+
+
+==BACKUP RECOVERY==
+
+git clone file:///media/seagate/utv/redeclipse-git/
+for i in $(git branch -a | grep origin); do git checkout -b $(echo "$i" | sed 's#.*origin\/\(.*\)#\1#') "$i"; done
+
+
+==PPA PACKAGE==
+
+git checkout svn
+git svn rebase
+export VERSION=$(git svn info | sed -n 's/Last\ Changed\ Rev:\ \([0-9]*\)/\1/p')
+export PPA_VERSION=1.0+svn$VERSION-ppa1
+git checkout ppa
+git merge svn
+git merge rebased
+git checkout rebased -- debian/
+git checkout ppa -- debian/changelog
+git commit
+
+git-dch --release --auto --new-version=$PPA_VERSION --debian-branch=ppa
+#Remove the irrelevant old debian changes
+git commit -am "Changelog for r$VERSION PPA release"
+git tag $PPA_VERSION
+
+git-buildpackage -j2 -us -uc --git-debian-branch=ppa --git-upstream-branch=svn
+sudo dpkg -i ../redeclipse*"$PPA_VERSION"*.deb
+git reset --hard && git clean -df
+git-buildpackage -j2 -sa -S --git-debian-branch=ppa --git-upstream-branch=svn
+dput resvn ../redeclipse_"$PPA_VERSION"_source.changes
+
+# gnome-session-save --shutdown-dialog
+
+
+PPA PACKAGE
+
+git checkout upstream
+git svn rebase
+git checkout clean_upstream
+git merge upstream
+git rm bin/ -r
+git commit
+git checkout master
+git merge clean_upstream
+
+git-dch --release --auto --new-version=0.90+svn###-ppa1
+git commit -am "Changelog for r### PPA release"
+git tag 0.90+svn###
+
+git-buildpackage -us -uc --git-upstream-branch=clean_upstream
+git-buildpackage -sa -S --git-upstream-branch=clean_upstream
+dput ppa:arand/redeclipse ../redeclipse_0.90+svn###-ppa1_source.changes && gnome-session-save --shutdown-dialog
+
+###
+
+COMPILE
+
+git checkout upstream
+git svn rebase
+git checkout compile
+git merge upstream
+
+pushd src && make install && make clean && make clean-enet && popd
+
+git commit -am "Compiled and cleaned"
+
+###
+
+COMPRESS
+
+git fsck --full
+git repack -a -d && git gc --prune
+
+###
+
+SNAPSHOT
+
+git-dch --snapshot --auto --new-version=0.90+svn###-ppa1
+vim debian/changelog
+git commit -am "Changelog for r### snapshot"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git

