This is an automated email from the git hooks/post-receive script. arand-guest pushed a commit to branch debdir in repository redeclipse.
commit f4ac3438b6554bf7a5b5643e0fd0385ba5dc763e Author: Martin Erik Werner <[email protected]> Date: Wed Nov 30 00:47:02 2011 +0100 Remove personal todo --- 01_suggestions | 30 ------- 02_licensing | 79 ------------------- 03_unincluded_copyrights | 200 ----------------------------------------------- 04_cleaning_copyrights | 7 -- 05_git_workflow | 149 ----------------------------------- 06_fonts | 21 ----- 07_sflc_telephone | 40 ---------- 7 files changed, 526 deletions(-) diff --git a/01_suggestions b/01_suggestions deleted file mode 100644 index 348c1aa..0000000 --- a/01_suggestions +++ /dev/null @@ -1,30 +0,0 @@ -Feature Requests: -* Neither ~ nor / seems to work properly on a non US keyboard, t does though, - or rebinding... -* 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 -* Don't allow melee-whenever-touching by continuously holding down the [q] key, - make it only activate melee a certain period [~< 1s?] after key is pressed, - then turn inactive. - - https://sourceforge.net/apps/trac/redeclipse/ticket/28 -* Make it possible to stop RE from creating the folder in the homedir, logically - using -h - - https://sourceforge.net/apps/trac/redeclipse/ticket/29 -* Use RE_DIR=$(dirname $0) in script to allow executing script from anywhere - - https://sourceforge.net/apps/trac/redeclipse/ticket/30 - -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 deleted file mode 100644 index 66dc24a..0000000 --- a/02_licensing +++ /dev/null @@ -1,79 +0,0 @@ -* 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/win (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: - - The Red Eclipse Project is Copyright: 2010-2011 Quinton "quin" Reeves - 2010-2011 Lee "eihrul" Salzman - - Limited rights are granted to: - * Redistribute verbatim copies of the entire Red Eclipse Project. - * Redistribute modified versions, plainly marked as such, of the entire - Red Eclipse Project 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 content of the Red Eclipse Project into parts). - - Stripped of items which are not relevant to the target OS. - - Accompanied by patches for the purpose of modifying the Red Eclipse Project - at build time. - - Recompiled, possibly using patches modifying the Red Eclipse Project 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 and may not use the Red - Eclipse trademarks. - - The Red Eclipse trademarks are Copyright (C) 2010-2011 Red Eclipse Team - - 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/03_unincluded_copyrights b/03_unincluded_copyrights deleted file mode 100644 index ed7fae7..0000000 --- a/03_unincluded_copyrights +++ /dev/null @@ -1,200 +0,0 @@ -bin/jpeg.dll -bin/libfreetype-6.dll -bin/libpng12-0.dll -bin/libtiff-3.dll -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/begin_code.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/close_code.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_active.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_audio.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_byteorder.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_cdrom.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_config_dreamcast.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_config.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_config_macos.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_config_macosx.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_config_os2.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_config_win32.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_copying.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_cpuinfo.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_endian.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_error.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_events.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_getenv.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_joystick.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_keyboard.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_keysym.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_loadso.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_main.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_mouse.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_mutex.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_opengl.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_platform.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_quit.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_rwops.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_stdinc.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_syswm.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_thread.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_timer.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_types.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_version.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Headers/SDL_video.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/close_code.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_active.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_audio.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_byteorder.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_cdrom.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_dreamcast.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macos.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_os2.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_copying.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_cpuinfo.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_error.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_events.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_getenv.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_joystick.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_loadso.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_main.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mutex.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_opengl.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_quit.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_timer.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_types.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/begin_code.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/close_code.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_active.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_audio.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_byteorder.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_cdrom.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_config_dreamcast.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_config.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_config_macos.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_config_macosx.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_config_os2.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_config_win32.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_copying.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_cpuinfo.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_endian.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_error.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_events.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_getenv.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_joystick.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_keyboard.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_keysym.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_loadso.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_main.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_mouse.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_mutex.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_opengl.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_platform.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_quit.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_rwops.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_stdinc.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_syswm.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_thread.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_timer.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_types.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_version.h -bin/redeclipse.app/Contents/Frameworks/SDL.framework/Versions/Current/Headers/SDL_video.h -bin/redeclipse.app/Contents/Frameworks/SDL_image.framework/Headers/SDL_image.h -bin/redeclipse.app/Contents/Frameworks/SDL_image.framework/Versions/A/Headers/SDL_image.h -bin/redeclipse.app/Contents/Frameworks/SDL_image.framework/Versions/Current/Headers/SDL_image.h -bin/redeclipse.app/Contents/Frameworks/SDL_mixer.framework/Headers/SDL_mixer.h -bin/redeclipse.app/Contents/Frameworks/SDL_mixer.framework/SDL_mixer -bin/redeclipse.app/Contents/Frameworks/SDL_mixer.framework/Versions/A/Headers/SDL_mixer.h -bin/redeclipse.app/Contents/Frameworks/SDL_mixer.framework/Versions/A/SDL_mixer -bin/redeclipse.app/Contents/Frameworks/SDL_mixer.framework/Versions/Current/Headers/SDL_mixer.h -bin/redeclipse.app/Contents/Frameworks/SDL_mixer.framework/Versions/Current/SDL_mixer -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Headers/MPEGaction.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Headers/MPEGaudio.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Headers/MPEGerror.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Headers/MPEGfilter.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Headers/MPEG.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Headers/MPEGring.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Headers/MPEGstream.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Headers/MPEGvideo.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Headers/smpeg.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/A/Headers/MPEGaction.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/A/Headers/MPEGaudio.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/A/Headers/MPEGerror.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/A/Headers/MPEGfilter.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/A/Headers/MPEG.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/A/Headers/MPEGring.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/A/Headers/MPEGstream.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/A/Headers/MPEGvideo.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/A/Headers/smpeg.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/Current/Headers/MPEGaction.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/Current/Headers/MPEGaudio.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/Current/Headers/MPEGerror.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/Current/Headers/MPEGfilter.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/Current/Headers/MPEG.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/Current/Headers/MPEGring.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/Current/Headers/MPEGstream.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/Current/Headers/MPEGvideo.h -bin/redeclipse.app/Contents/Frameworks/smpeg.framework/Versions/Current/Headers/smpeg.h -bin/redeclipse.app/Contents/Info.plist -bin/SDL_mixer.dll -bin/zlib1.dll -src/include/begin_code.h -src/include/close_code.h -src/include/GL/glext.h -src/include/SDL_active.h -src/include/SDL_audio.h -src/include/SDL_byteorder.h -src/include/SDL_cdrom.h -src/include/SDL_config.h -src/include/SDL_config_macosx.h -src/include/SDL_config_win32.h -src/include/SDL_copying.h -src/include/SDL_cpuinfo.h -src/include/SDL_endian.h -src/include/SDL_error.h -src/include/SDL_events.h -src/include/SDL_getenv.h -src/include/SDL.h -src/include/SDL_image.h -src/include/SDL_joystick.h -src/include/SDL_keyboard.h -src/include/SDL_keysym.h -src/include/SDL_loadso.h -src/include/SDL_main.h -src/include/SDL_mixer.h -src/include/SDL_mouse.h -src/include/SDL_mutex.h -src/include/SDL_opengl.h -src/include/SDL_platform.h -src/include/SDL_quit.h -src/include/SDL_rwops.h -src/include/SDL_stdinc.h -src/include/SDL_syswm.h -src/include/SDL_thread.h -src/include/SDL_timer.h -src/include/SDL_types.h -src/include/SDL_version.h -src/include/SDL_video.h -src/include/wincompat.h -src/include/zconf.h -src/include/zlib.h -src/install/install.mpi -src/site/bits/index.php -src/site/bits/js/easySlider1.7.js -src/site/bits/js/jquery.js -src/site/bits/js/jquery.lightbox-0.5.js -src/site/bits/style.css diff --git a/04_cleaning_copyrights b/04_cleaning_copyrights deleted file mode 100644 index 47c0074..0000000 --- a/04_cleaning_copyrights +++ /dev/null @@ -1,7 +0,0 @@ -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 diff --git a/05_git_workflow b/05_git_workflow deleted file mode 100644 index b56c87c..0000000 --- a/05_git_workflow +++ /dev/null @@ -1,149 +0,0 @@ -==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.1+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_svn_clean -git merge debian_clean - -git-dch --release --auto --new-version=$PPA_VERSION --debian-branch=ppa_svn_clean -git commit -am "Changelog for r$VERSION PPA release" -git tag $PPA_VERSION - -git-buildpackage -j2 -us -uc --git-debian-branch=ppa_svn_clean --git-upstream-branch=clean -sudo dpkg -i ../redeclipse-svn*"$PPA_VERSION"*.deb - -# git-buildpackage clean --git-debian-branch=ppa_svn_clean --git-upstream-branch=clean; quilt pop -a -git reset --hard && git clean -df -git-buildpackage -j2 -sa -S --git-debian-branch=ppa_svn_clean --git-upstream-branch=clean -dput resvn ../redeclipse-svn_"$PPA_VERSION"_source.changes - -pushd $HOME/utv/hydrazine; ./lp-ppa-cross-series-copy arand/redeclipse arand/redeclipse -s redeclipse-svn lucid maverick natty oneiric precise; popd - -#pushd $HOME/utv/hydrazine; sed '89s/spph.source_package_version/"'"$PPA_VERSION"'"/' $HOME/utv/hydrazine/lp-promote-ppa | python - -s redeclipse-svn arand/redeclipse arand/redeclipse; popd - -==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== - -export BACKUP_DIR="/media/seagate/utv/backup-git" -export REPO_DIR="$HOME/utv/repository" - -mkdir "$BACKUP_DIR" -cd "$BACKUP_DIR" -git init --bare -git clone --mirror "$REPO_DIR" -cd "$REPO_DIR" -git remote add --mirror seagate "$BACKUP_DIR" -git push seagate - - -==BACKUP RECOVERY== - -export BACKUP_DIR="/media/seagate/utv/backup-git" -export REPO_DIR="$HOME/utv/repository" - -git clone "$BACKUP_DIR" "$REPO_DIR" -cd "$REPO_DIR" -for i in $(git branch -a | grep origin); do git checkout -b $(echo "$i" | sed 's#.*origin\/\(.*\)#\1#') "$i"; done - -# Alternatively -git clone --mirror "$BACKUP_DIR" "$REPO_DIR"/.git -cd "$REPO_DIR" -git config --bool core.bare false # (2) -git checkout master - - -==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" diff --git a/06_fonts b/06_fonts deleted file mode 100644 index fa55004..0000000 --- a/06_fonts +++ /dev/null @@ -1,21 +0,0 @@ -./ttf2font Selfism\ Bold.otf -g3 -d4 -o1 - -./ttf2font Selfism\ Bold.otf -nemphasis -g3 -d4 -o1 - -./ttf2font Selfism\ Bold.otf -nradar -g3 -d1 -o1 - -./ttf2font Selfism\ Bold.otf -nsub -g3 -d4 -o1 - -./ttf2font Selfism\ Bold.otf -nsuper -g3 -d5 -o1 - -./ttf2font CPMono_v07\ Plain.otf -nsuper -g3 -d3 -o1 - -./ttf2font CPMono_v07\ Plain.otf -ncommand -g3 -d3 -o1 - -./ttf2font CPMono_v07\ Plain.otf -nconsole -g3 -d3 -o1 - -./ttf2font CPMono_v07\ Plain.otf -nconsub -g3 -d1 -o1 - -http://www.sonntag.nl/seiten/free/selfism/selfism.htm - -http://www.fontspace.com/liquitype/cp-mono diff --git a/07_sflc_telephone b/07_sflc_telephone deleted file mode 100644 index d4cc350..0000000 --- a/07_sflc_telephone +++ /dev/null @@ -1,40 +0,0 @@ -Redeclipse, -enginge free, content mainly CC-licensed -origin from bloodfrontier with a majority of content freeware-licensed - -Lead dev, quinton seems to agree with option 4. - -? Does it seem like a reasonable license in your eyes? - -? Any particular improvements you think of? - -? What kind of scope does the "" - -? Registration is unlikely in our case, is that something to take into consideration? - -? Are there any other examples you could point at for licenses of this kind? - -? Do you know anything of the trademark talks of gnome/sflc/debian? Should one wait for that? - -? Debian uses a rather restrictive version? - - -Information given: - -http://www.softwarefreedom.org/resources/2008/foss-primer.html#x1-600005 -http://wiki.documentfoundation.org/TradeMark_Policy -http://svncorp.org/legal/trademark-policy.html - -Recompression only clause is very ambiguous, may require relicensing, needs removal. - -"Substantially unmodified" is a useful buzzword. - -Preferable to use sections like: -* permitted use -* non-permitted use - -Separate trademark from copyright, maybe: -Source code -Object code -Images, logos (Possibly merged with above) -Trademark Policy (possibly in a separate document) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

