Hi all, I plan to fix #965521 and #998958, and #780484.
The debdiff is as attachment.
The plan is,
I'll wait for 10 days to see if any more comments.
And then I'll upload it to delay/10 queue.
The changes are as following:
* Non-maintainer upload.
* Bump debhelper to 12 (Closes: #965521)
- debian/rules: port to use dh (Closes: #998958)
* Port to DebSrc3.0 (quilt)
* Distribute manpage (Closes: #780484)
Yours,
Paul
diff -Nru filler-1.02/debian/changelog filler-1.02/debian/changelog
--- filler-1.02/debian/changelog 2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/debian/changelog 2022-12-10 03:20:44.000000000 +0800
@@ -1,3 +1,16 @@
+filler (1.02-6.4) unstable; urgency=low
+
+ [ Ying-Chun Liu (PaulLiu) ]
+ * Non-maintainer upload.
+ * Bump debhelper to 12 (Closes: #965521)
+ - debian/rules: port to use dh (Closes: #998958)
+ * Port to DebSrc3.0 (quilt)
+
+ [ Jean-Michel Nirgal Vourgère <jmv_...@nirgal.com> ]
+ * Distribute manpage (Closes: #780484)
+
+ -- Ying-Chun Liu (PaulLiu) <paul...@debian.org> Sat, 10 Dec 2022 03:20:44
+0800
+
filler (1.02-6.3) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru filler-1.02/debian/clean filler-1.02/debian/clean
--- filler-1.02/debian/clean 1970-01-01 08:00:00.000000000 +0800
+++ filler-1.02/debian/clean 2022-12-10 03:20:44.000000000 +0800
@@ -0,0 +1,3 @@
+other/filler.png
+debian/filler.xpm
+filler.jar
diff -Nru filler-1.02/debian/compat filler-1.02/debian/compat
--- filler-1.02/debian/compat 2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/debian/compat 1970-01-01 08:00:00.000000000 +0800
@@ -1 +0,0 @@
-5
diff -Nru filler-1.02/debian/control filler-1.02/debian/control
--- filler-1.02/debian/control 2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/debian/control 2022-12-10 03:20:44.000000000 +0800
@@ -2,13 +2,13 @@
Section: games
Priority: optional
Maintainer: James Damour (Suvarov454) <suvarov...@users.sourceforge.net>
-Build-Depends: debhelper (>= 5.0.0), dh-strip-nondeterminism
+Build-Depends: debhelper-compat (= 12), dh-strip-nondeterminism
Build-Depends-Indep: sharutils, default-jdk
Standards-Version: 3.8.3
Package: filler
Architecture: all
-Depends: default-jre | java1-runtime | java2-runtime
+Depends: default-jre | java1-runtime | java2-runtime, ${misc:Depends}
Description: simple game where two players try to capture half the board
Filler is a simple game where two players try to capture half of the board.
Players take turns selecting colours to capture all adjacent hexes of the
diff -Nru filler-1.02/debian/filler.manpages filler-1.02/debian/filler.manpages
--- filler-1.02/debian/filler.manpages 1970-01-01 08:00:00.000000000 +0800
+++ filler-1.02/debian/filler.manpages 2022-12-10 03:20:44.000000000 +0800
@@ -0,0 +1 @@
+debian/filler.6
diff -Nru filler-1.02/debian/patches/0001_Makefile.patch
filler-1.02/debian/patches/0001_Makefile.patch
--- filler-1.02/debian/patches/0001_Makefile.patch 1970-01-01
08:00:00.000000000 +0800
+++ filler-1.02/debian/patches/0001_Makefile.patch 2022-12-10
03:20:44.000000000 +0800
@@ -0,0 +1,18 @@
+Index: filler-1.02/Makefile
+===================================================================
+--- filler-1.02.orig/Makefile
++++ filler-1.02/Makefile
+@@ -8,10 +8,10 @@ DIR=src/friendless/games/filler
+
+ $(JAR):
+ mkdir classes || $(RM) -rf classes/*
+- javac -d classes src/friendless/awt/*.java
+- javac -classpath classes -d classes $(DIR)/*.java $(DIR)/player/*.java
$(DIR)/remote/*.java $(DIR)/remote/messages/*.java
++ $(JAVA_HOME)/bin/javac -d classes src/friendless/awt/*.java
++ $(JAVA_HOME)/bin/javac -classpath classes:src -d classes $(DIR)/*.java
$(DIR)/player/*.java $(DIR)/remote/*.java $(DIR)/remote/messages/*.java
+ cp -R res/* classes
+- cd classes && jar cmf ../other/metainfo.txt $(JAR) friendless
++ cd classes && $(JAVA_HOME)/bin/jar cmf ../other/metainfo.txt $(JAR)
friendless
+ mv classes/$(JAR) .
+
+ clean:
diff -Nru filler-1.02/debian/patches/0002_filler_fix_path.patch
filler-1.02/debian/patches/0002_filler_fix_path.patch
--- filler-1.02/debian/patches/0002_filler_fix_path.patch 1970-01-01
08:00:00.000000000 +0800
+++ filler-1.02/debian/patches/0002_filler_fix_path.patch 2022-12-10
03:20:44.000000000 +0800
@@ -0,0 +1,10 @@
+Index: filler-1.02/other/filler
+===================================================================
+--- filler-1.02.orig/other/filler
++++ filler-1.02/other/filler
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+-cd /usr/local/filler
+-java -Duser.language=$LANG -jar /usr/local/filler/filler.jar $*
++cd /var/games
++java -Duser.language=$LANG -jar /usr/share/java/filler.jar $*
diff -Nru filler-1.02/debian/patches/0003_add_desktop_file.patch
filler-1.02/debian/patches/0003_add_desktop_file.patch
--- filler-1.02/debian/patches/0003_add_desktop_file.patch 1970-01-01
08:00:00.000000000 +0800
+++ filler-1.02/debian/patches/0003_add_desktop_file.patch 2022-12-10
03:20:44.000000000 +0800
@@ -0,0 +1,33 @@
+Index: filler-1.02/other/filler.desktop
+===================================================================
+--- /dev/null
++++ filler-1.02/other/filler.desktop
+@@ -0,0 +1,8 @@
++[Desktop Entry]
++Name=Filler
++Comment=Filler in Java Game
++Comment[pl]=Filler w Javie
++Icon=filler.png
++Exec=filler
++Terminal=0
++Type=Application
+Index: filler-1.02/other/filler.u
+===================================================================
+--- /dev/null
++++ filler-1.02/other/filler.u
+@@ -0,0 +1,15 @@
++begin 644 filler.png
++MB5!.1PT*&@H````-24A$4@```"`````@!`,```"!5&?'````,%!,5$4```"`
++M````@`"`@````("``(``@(#`P,"`@(#_````_P#__P```/__`/\`______]/
++M$R9)`````6)+1T0`B`4=2`````EP2%ES```.Q```#L0!E2L.&P````=T24U%
++M!]`,#103*=$"40$````7=$58=$%U=&AO<@!5;&5A54QE860@4WES=&5M[^%C
++MO````!5T15AT4V]F='=A<F4`54QE860@4WES=&5M"L=V/0```,A)1$%4:-Z-
++MDK$-PR`01:]TQY96QJ!,=ZW9`#&!)19PP0`T[.`JPMCH\G$:XR9&K_K%O\<!
++MB?2'9%4=)$IWT+I-5"SM,QT+U:A(&</.L?<<`J>D'P3HR,7F?<['DFL<,(5'
++M9L=LF#UKAL=G?!5G-S/M?A[D2=!WP!3E`+,D`YAB/("-"-`/@EO':9J8`[=9
++MX\^TIGB$!3;@%/L;]!TPQ29J;&`KQ<(4NTJI@;TYIQ\$Z,!S-/`ZY335[PO-
++M=!!]@=H=\P6Z_0;Y`NW?9+E#;O9*````%W1%6'1!=71H;W(`56QE855,96%D
++M(%-Y<W1E;>_A8[P````5=$58=%-O9G1W87)E`%5,96%D(%-Y<W1E;0K'=CT`
+++````245.1*Y"8((`
++`
++end
diff -Nru filler-1.02/debian/patches/0004_properties.patch
filler-1.02/debian/patches/0004_properties.patch
--- filler-1.02/debian/patches/0004_properties.patch 1970-01-01
08:00:00.000000000 +0800
+++ filler-1.02/debian/patches/0004_properties.patch 2022-12-10
03:20:44.000000000 +0800
@@ -0,0 +1,60 @@
+Index: filler-1.02/res/friendless/games/filler/resources.properties
+===================================================================
+--- filler-1.02.orig/res/friendless/games/filler/resources.properties
++++ filler-1.02/res/friendless/games/filler/resources.properties
+@@ -60,6 +60,7 @@ filler.ranking.INTLMASTER=Komosubi
+ filler.ranking.GRANDMASTER=Sekiwake
+ filler.ranking.SUPERGRANDMASTER=Ozeki
+ filler.ranking.WORLDCHAMPION=Yokozuna
++filler.ratings.permissionmesg=You must belong to the 'games' group to update
AI ratings.
+ filler.mainpanel.name=Play
+ filler.settings.name=Settings
+ description.Human={0} is a player of great cunning, who doesn''t like losing.
+Index: filler-1.02/res/friendless/games/filler/resources_fi.properties
+===================================================================
+--- filler-1.02.orig/res/friendless/games/filler/resources_fi.properties
++++ filler-1.02/res/friendless/games/filler/resources_fi.properties
+@@ -43,6 +43,7 @@ filler.ranking.INTLMASTER=Komosubi - suu
+ filler.ranking.GRANDMASTER=Sekiwake - guru
+ filler.ranking.SUPERGRANDMASTER=Ozeki - gurumpi
+ filler.ranking.WORLDCHAMPION=Yokozuna - superguru
++filler.ratings.permissionmesg=Please translate this message and contact
filler's maintainer. You must belong to the 'games' group to update AI ratings.
+ filler.mainpanel.name=Peli
+ filler.settings.name=Asetukset
+ filler.string.matchresult={0} voittaa (vs. {1}), {2} - {3} pistettä.
+Index: filler-1.02/res/friendless/games/filler/resources_nl.properties
+===================================================================
+--- filler-1.02.orig/res/friendless/games/filler/resources_nl.properties
++++ filler-1.02/res/friendless/games/filler/resources_nl.properties
+@@ -43,6 +43,7 @@ filler.ranking.INTLMASTER=Komosubi
+ filler.ranking.GRANDMASTER=Sekiwake
+ filler.ranking.SUPERGRANDMASTER=Ozeki
+ filler.ranking.WORLDCHAMPION=Yokozuna
++filler.ratings.permissionmesg=Please translate this message and contact
filler's maintainer. You must belong to the 'games' group to update AI ratings.
+ filler.mainpanel.name=Spelbord
+ filler.settings.name=Instellingen
+ filler.string.matchresult={0} verslaat {1}, {2} punten naar {3}.
+Index: filler-1.02/res/friendless/games/filler/resources_pl.properties
+===================================================================
+--- filler-1.02.orig/res/friendless/games/filler/resources_pl.properties
++++ filler-1.02/res/friendless/games/filler/resources_pl.properties
+@@ -44,6 +44,7 @@ filler.ranking.INTLMASTER=Komosubi
+ filler.ranking.GRANDMASTER=Sekiwake
+ filler.ranking.SUPERGRANDMASTER=Ozeki
+ filler.ranking.WORLDCHAMPION=Yokozuna
++filler.ratings.permissionmesg=Please translate this message and contact
filler's maintainer. You must belong to the 'games' group to update AI ratings.
+ filler.mainpanel.name=Nowa gra
+ filler.settings.name=Ustawienia
+ filler.string.matchresult={0} wygra\u0142 z {1}, {2} do {3}.
+Index: filler-1.02/res/friendless/games/filler/resources_ru.properties
+===================================================================
+--- filler-1.02.orig/res/friendless/games/filler/resources_ru.properties
++++ filler-1.02/res/friendless/games/filler/resources_ru.properties
+@@ -44,6 +44,7 @@ filler.ranking.INTLMASTER=\u041a\u043e\u
+ filler.ranking.GRANDMASTER=\u0421\u0435\u043a\u0438\u0432\u0430\u043a\u0435
+ filler.ranking.SUPERGRANDMASTER=\u041e\u0437\u0435\u043a\u0438
+ filler.ranking.WORLDCHAMPION=\u0415\u043a\u043e\u0434\u0437\u0443\u043d\u0430
++filler.ratings.permissionmesg=Please translate this message and contact
filler's maintainer. You must belong to the 'games' group to update AI ratings.
+ filler.mainpanel.name=\u0418\u0433\u0440\u0430
+ filler.settings.name=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
+ filler.string.matchresult={0} \u043f\u043e\u0431\u0435\u0434\u0438\u043b {1},
{2} points to {3}.
diff -Nru filler-1.02/debian/patches/0005_fix_HVCodeLayout.patch
filler-1.02/debian/patches/0005_fix_HVCodeLayout.patch
--- filler-1.02/debian/patches/0005_fix_HVCodeLayout.patch 1970-01-01
08:00:00.000000000 +0800
+++ filler-1.02/debian/patches/0005_fix_HVCodeLayout.patch 2022-12-10
03:20:44.000000000 +0800
@@ -0,0 +1,24 @@
+Index: filler-1.02/src/friendless/awt/HCodeLayout.java
+===================================================================
+--- filler-1.02.orig/src/friendless/awt/HCodeLayout.java
++++ filler-1.02/src/friendless/awt/HCodeLayout.java
+@@ -51,6 +51,7 @@ public final class HCodeLayout implement
+ }
+
+ public void addLayoutComponent(String code, Component comp) {
++ if (null == code) code = new String();
+ codes.put(comp,code);
+ }
+
+Index: filler-1.02/src/friendless/awt/VCodeLayout.java
+===================================================================
+--- filler-1.02.orig/src/friendless/awt/VCodeLayout.java
++++ filler-1.02/src/friendless/awt/VCodeLayout.java
+@@ -58,6 +58,7 @@ public final class VCodeLayout implement
+ }
+
+ public void addLayoutComponent(String code, Component comp) {
++ if (null == code) code = new String();
+ codes.put(comp,code);
+ }
+
diff -Nru filler-1.02/debian/patches/0006_fix_filler_ratings.patch
filler-1.02/debian/patches/0006_fix_filler_ratings.patch
--- filler-1.02/debian/patches/0006_fix_filler_ratings.patch 1970-01-01
08:00:00.000000000 +0800
+++ filler-1.02/debian/patches/0006_fix_filler_ratings.patch 2022-12-10
03:20:44.000000000 +0800
@@ -0,0 +1,55 @@
+Index: filler-1.02/src/friendless/games/filler/FillerPanel.java
+===================================================================
+--- filler-1.02.orig/src/friendless/games/filler/FillerPanel.java
++++ filler-1.02/src/friendless/games/filler/FillerPanel.java
+@@ -207,7 +207,12 @@ public final class FillerPanel extends J
+ cancelButton.setEnabled(false);
+ playerNames[0].setEnabled(true);
+ playerNames[1].setEnabled(true);
+- PlayerRatings.save();
++ if (!PlayerRatings.save()) {
++ // Display a dialog telling player to add self to "games" group.
++ String h2h = resources.getString("filler.string.h2h");
++ String mesg =
resources.getString("filler.ratings.permissionmesg");
++ showMessage(mesg, h2h);
++ }
+ }
+
+ /**
+Index: filler-1.02/src/friendless/games/filler/PlayerRatings.java
+===================================================================
+--- filler-1.02.orig/src/friendless/games/filler/PlayerRatings.java
++++ filler-1.02/src/friendless/games/filler/PlayerRatings.java
+@@ -29,7 +29,7 @@ public class PlayerRatings implements Se
+ * Filename of the file we store the ratings in.
+ * This file contains a Java-serialised instance of this class.
+ */
+- public static final String RATINGS_FILENAME = "ratings.ser";
++ public static final String RATINGS_FILENAME = "filler.ratings";
+ static final long serialVersionUID = -5410208778282312709L;
+ /** The singleton instance. */
+ static PlayerRatings theInstance;
+@@ -134,7 +134,8 @@ public class PlayerRatings implements Se
+ }
+ }
+
+- public static void save() {
++ public static boolean save() {
++ boolean canSave = false;
+ try {
+ File f = new File(System.getProperty("user.dir") + File.separator
+ RATINGS_FILENAME);
+ //System.out.println("Saving ratings to " + f.getCanonicalPath());
+@@ -143,11 +144,13 @@ public class PlayerRatings implements Se
+ oos.writeObject(theInstance);
+ oos.close();
+ fos.close();
++ canSave = true;
+ } catch (Exception ex) {
+ System.out.println("In PlayerRatings.save");
+ System.out.println(System.getProperty("user.dir"));
+ ex.printStackTrace();
+ }
++ return canSave;
+ }
+ }
+
diff -Nru filler-1.02/debian/patches/0007_fix_filler_splash.patch
filler-1.02/debian/patches/0007_fix_filler_splash.patch
--- filler-1.02/debian/patches/0007_fix_filler_splash.patch 1970-01-01
08:00:00.000000000 +0800
+++ filler-1.02/debian/patches/0007_fix_filler_splash.patch 2022-12-10
03:20:44.000000000 +0800
@@ -0,0 +1,20 @@
+Index: filler-1.02/src/friendless/games/filler/Filler.java
+===================================================================
+--- filler-1.02.orig/src/friendless/games/filler/Filler.java
++++ filler-1.02/src/friendless/games/filler/Filler.java
+@@ -74,8 +74,14 @@ public final class Filler implements Run
+ System.out.println("default locale is " + Locale.getDefault());
+ // load resources
+ resources =
ResourceBundle.getBundle("friendless.games.filler.resources", defaultLocale);
++
++ String splashStr = resources.getString ("filler.filename.splash");
++ java.net.URL splashUrl = Filler.class.getResource (splashStr);
++ ImageIcon splashIcon = new ImageIcon (splashUrl);
++ /* testing SableVM
+ ImageIcon splashIcon = new
ImageIcon(Filler.class.getResource(resources.getString("filler.filename.splash")));
+- SplashScreen splash = SplashScreen.show(splashIcon);
++ ** end testing */
++ friendless.awt.SplashScreen splash =
friendless.awt.SplashScreen.show(splashIcon);
+ EloRating.setResources(resources);
+ Tournaments.setResources(resources);
+ Filler f = new Filler();
diff -Nru
filler-1.02/debian/patches/0008_fix_TournamentPointsTableRow_java.patch
filler-1.02/debian/patches/0008_fix_TournamentPointsTableRow_java.patch
--- filler-1.02/debian/patches/0008_fix_TournamentPointsTableRow_java.patch
1970-01-01 08:00:00.000000000 +0800
+++ filler-1.02/debian/patches/0008_fix_TournamentPointsTableRow_java.patch
2022-12-10 03:20:44.000000000 +0800
@@ -0,0 +1,13 @@
+Index: filler-1.02/src/friendless/games/filler/TournamentPointsTableRow.java
+===================================================================
+--- filler-1.02.orig/src/friendless/games/filler/TournamentPointsTableRow.java
++++ filler-1.02/src/friendless/games/filler/TournamentPointsTableRow.java
+@@ -78,7 +78,7 @@ public class TournamentPointsTableRow im
+ public int compareTo(TournamentPointsTableRow other) {
+ if (this.getWon() != other.getWon()) {
+ // wins aren't equal
+- return (other.getWon() - this.getWon());; // use wins to seperate
teams
++ return (other.getWon() - this.getWon()); // use wins to seperate
teams
+ } else {
+ return (other.getDiff() - this.getDiff()); //else use goal
difference to seperate teams
+ }
diff -Nru filler-1.02/debian/patches/series filler-1.02/debian/patches/series
--- filler-1.02/debian/patches/series 1970-01-01 08:00:00.000000000 +0800
+++ filler-1.02/debian/patches/series 2022-12-10 03:20:44.000000000 +0800
@@ -0,0 +1,8 @@
+0001_Makefile.patch
+0002_filler_fix_path.patch
+0003_add_desktop_file.patch
+0004_properties.patch
+0005_fix_HVCodeLayout.patch
+0006_fix_filler_ratings.patch
+0007_fix_filler_splash.patch
+0008_fix_TournamentPointsTableRow_java.patch
diff -Nru filler-1.02/debian/rules filler-1.02/debian/rules
--- filler-1.02/debian/rules 2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/debian/rules 2022-12-10 03:20:44.000000000 +0800
@@ -4,40 +4,12 @@
export JAVA_HOME=/usr/lib/jvm/default-java
-build: build-stamp
-build-stamp:
- dh_testdir
+%:
+ dh $@
- # Add here commands to compile the package.
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- $(MAKE) clean
- -rm -f other/filler.png
- -rm -f debian/filler.xpm
- -rm -f filler.jar
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+override_dh_auto_install:
uudecode -o other/filler.png other/filler.u
uudecode -o debian/filler.xpm debian/filler.u
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
install -m 664 -o root -g games other/ratings.ser
debian/filler/var/games/filler.ratings
gzip -f debian/filler/var/games/filler.ratings
install -m 755 -o root -g games other/filler debian/filler/usr/games
@@ -45,24 +17,8 @@
install -m 644 -o root -g root other/filler.png
debian/filler/usr/share/pixmaps
install -m 644 -o root -g root other/filler.desktop
debian/filler/usr/share/applications
install -m 644 -o root -g games filler.jar debian/filler/usr/share/java
- dh_installdocs
- dh_installmenu
- dh_installman
- dh_installchangelogs CHANGES
- dh_strip_nondeterminism
- dh_compress
- dh_fixperms
+
# You may want to make some executables suid here.
chown root debian/filler/usr/games/filler
chgrp games debian/filler/usr/games/filler
chmod 755 debian/filler/usr/games/filler
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch:
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary install
diff -Nru filler-1.02/debian/source/format filler-1.02/debian/source/format
--- filler-1.02/debian/source/format 1970-01-01 08:00:00.000000000 +0800
+++ filler-1.02/debian/source/format 2022-12-10 03:18:12.000000000 +0800
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru filler-1.02/Makefile filler-1.02/Makefile
--- filler-1.02/Makefile 2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/Makefile 2001-01-03 15:26:12.000000000 +0800
@@ -8,10 +8,10 @@
$(JAR):
mkdir classes || $(RM) -rf classes/*
- $(JAVA_HOME)/bin/javac -d classes src/friendless/awt/*.java
- $(JAVA_HOME)/bin/javac -classpath classes:src -d classes $(DIR)/*.java
$(DIR)/player/*.java $(DIR)/remote/*.java $(DIR)/remote/messages/*.java
+ javac -d classes src/friendless/awt/*.java
+ javac -classpath classes -d classes $(DIR)/*.java $(DIR)/player/*.java
$(DIR)/remote/*.java $(DIR)/remote/messages/*.java
cp -R res/* classes
- cd classes && $(JAVA_HOME)/bin/jar cmf ../other/metainfo.txt $(JAR)
friendless
+ cd classes && jar cmf ../other/metainfo.txt $(JAR) friendless
mv classes/$(JAR) .
clean:
diff -Nru filler-1.02/other/filler filler-1.02/other/filler
--- filler-1.02/other/filler 2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/other/filler 2001-01-03 15:26:12.000000000 +0800
@@ -1,3 +1,3 @@
#!/bin/sh
-cd /var/games
-java -Duser.language=$LANG -jar /usr/share/java/filler.jar $*
+cd /usr/local/filler
+java -Duser.language=$LANG -jar /usr/local/filler/filler.jar $*
diff -Nru filler-1.02/other/filler.desktop filler-1.02/other/filler.desktop
--- filler-1.02/other/filler.desktop 2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/other/filler.desktop 1970-01-01 08:00:00.000000000 +0800
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Filler
-Comment=Filler in Java Game
-Comment[pl]=Filler w Javie
-Icon=filler.png
-Exec=filler
-Terminal=0
-Type=Application
diff -Nru filler-1.02/other/filler.u filler-1.02/other/filler.u
--- filler-1.02/other/filler.u 2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/other/filler.u 1970-01-01 08:00:00.000000000 +0800
@@ -1,15 +0,0 @@
-begin 644 filler.png
-MB5!.1PT*&@H````-24A$4@```"`````@!`,```"!5&?'````,%!,5$4```"`
-M````@`"`@````("``(``@(#`P,"`@(#_````_P#__P```/__`/\`______]/
-M$R9)`````6)+1T0`B`4=2`````EP2%ES```.Q```#L0!E2L.&P````=T24U%
-M!]`,#103*=$"40$````7=$58=$%U=&AO<@!5;&5A54QE860@4WES=&5M[^%C
-MO````!5T15AT4V]F='=A<F4`54QE860@4WES=&5M"L=V/0```,A)1$%4:-Z-
-MDK$-PR`01:]TQY96QJ!,=ZW9`#&!)19PP0`T[.`JPMCH\G$:XR9&K_K%O\<!
-MB?2'9%4=)$IWT+I-5"SM,QT+U:A(&</.L?<<`J>D'P3HR,7F?<['DFL<,(5'
-M9L=LF#UKAL=G?!5G-S/M?A[D2=!WP!3E`+,D`YAB/("-"-`/@EO':9J8`[=9
-MX\^TIGB$!3;@%/L;]!TPQ29J;&`KQ<(4NTJI@;TYIQ\$Z,!S-/`ZY335[PO-
-M=!!]@=H=\P6Z_0;Y`NW?9+E#;O9*````%W1%6'1!=71H;W(`56QE855,96%D
-M(%-Y<W1E;>_A8[P````5=$58=%-O9G1W87)E`%5,96%D(%-Y<W1E;0K'=CT`
-+````245.1*Y"8((`
-`
-end
diff -Nru filler-1.02/res/friendless/games/filler/resources_fi.properties
filler-1.02/res/friendless/games/filler/resources_fi.properties
--- filler-1.02/res/friendless/games/filler/resources_fi.properties
2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/res/friendless/games/filler/resources_fi.properties
2001-01-03 15:26:12.000000000 +0800
@@ -43,7 +43,6 @@
filler.ranking.GRANDMASTER=Sekiwake - guru
filler.ranking.SUPERGRANDMASTER=Ozeki - gurumpi
filler.ranking.WORLDCHAMPION=Yokozuna - superguru
-filler.ratings.permissionmesg=Please translate this message and contact
filler's maintainer. You must belong to the 'games' group to update AI ratings.
filler.mainpanel.name=Peli
filler.settings.name=Asetukset
filler.string.matchresult={0} voittaa (vs. {1}), {2} - {3} pistettä.
diff -Nru filler-1.02/res/friendless/games/filler/resources_nl.properties
filler-1.02/res/friendless/games/filler/resources_nl.properties
--- filler-1.02/res/friendless/games/filler/resources_nl.properties
2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/res/friendless/games/filler/resources_nl.properties
2001-01-03 15:26:12.000000000 +0800
@@ -43,7 +43,6 @@
filler.ranking.GRANDMASTER=Sekiwake
filler.ranking.SUPERGRANDMASTER=Ozeki
filler.ranking.WORLDCHAMPION=Yokozuna
-filler.ratings.permissionmesg=Please translate this message and contact
filler's maintainer. You must belong to the 'games' group to update AI ratings.
filler.mainpanel.name=Spelbord
filler.settings.name=Instellingen
filler.string.matchresult={0} verslaat {1}, {2} punten naar {3}.
diff -Nru filler-1.02/res/friendless/games/filler/resources_pl.properties
filler-1.02/res/friendless/games/filler/resources_pl.properties
--- filler-1.02/res/friendless/games/filler/resources_pl.properties
2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/res/friendless/games/filler/resources_pl.properties
2001-01-03 15:26:12.000000000 +0800
@@ -44,7 +44,6 @@
filler.ranking.GRANDMASTER=Sekiwake
filler.ranking.SUPERGRANDMASTER=Ozeki
filler.ranking.WORLDCHAMPION=Yokozuna
-filler.ratings.permissionmesg=Please translate this message and contact
filler's maintainer. You must belong to the 'games' group to update AI ratings.
filler.mainpanel.name=Nowa gra
filler.settings.name=Ustawienia
filler.string.matchresult={0} wygra\u0142 z {1}, {2} do {3}.
diff -Nru filler-1.02/res/friendless/games/filler/resources.properties
filler-1.02/res/friendless/games/filler/resources.properties
--- filler-1.02/res/friendless/games/filler/resources.properties
2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/res/friendless/games/filler/resources.properties
2001-01-03 15:26:12.000000000 +0800
@@ -60,7 +60,6 @@
filler.ranking.GRANDMASTER=Sekiwake
filler.ranking.SUPERGRANDMASTER=Ozeki
filler.ranking.WORLDCHAMPION=Yokozuna
-filler.ratings.permissionmesg=You must belong to the 'games' group to update
AI ratings.
filler.mainpanel.name=Play
filler.settings.name=Settings
description.Human={0} is a player of great cunning, who doesn''t like losing.
diff -Nru filler-1.02/res/friendless/games/filler/resources_ru.properties
filler-1.02/res/friendless/games/filler/resources_ru.properties
--- filler-1.02/res/friendless/games/filler/resources_ru.properties
2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/res/friendless/games/filler/resources_ru.properties
2001-01-03 15:26:12.000000000 +0800
@@ -44,7 +44,6 @@
filler.ranking.GRANDMASTER=\u0421\u0435\u043a\u0438\u0432\u0430\u043a\u0435
filler.ranking.SUPERGRANDMASTER=\u041e\u0437\u0435\u043a\u0438
filler.ranking.WORLDCHAMPION=\u0415\u043a\u043e\u0434\u0437\u0443\u043d\u0430
-filler.ratings.permissionmesg=Please translate this message and contact
filler's maintainer. You must belong to the 'games' group to update AI ratings.
filler.mainpanel.name=\u0418\u0433\u0440\u0430
filler.settings.name=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
filler.string.matchresult={0} \u043f\u043e\u0431\u0435\u0434\u0438\u043b {1},
{2} points to {3}.
diff -Nru filler-1.02/src/friendless/awt/HCodeLayout.java
filler-1.02/src/friendless/awt/HCodeLayout.java
--- filler-1.02/src/friendless/awt/HCodeLayout.java 2022-12-12
00:45:39.000000000 +0800
+++ filler-1.02/src/friendless/awt/HCodeLayout.java 2001-01-03
15:26:12.000000000 +0800
@@ -51,7 +51,6 @@
}
public void addLayoutComponent(String code, Component comp) {
- if (null == code) code = new String();
codes.put(comp,code);
}
diff -Nru filler-1.02/src/friendless/awt/VCodeLayout.java
filler-1.02/src/friendless/awt/VCodeLayout.java
--- filler-1.02/src/friendless/awt/VCodeLayout.java 2022-12-12
00:45:39.000000000 +0800
+++ filler-1.02/src/friendless/awt/VCodeLayout.java 2001-01-03
15:26:12.000000000 +0800
@@ -58,7 +58,6 @@
}
public void addLayoutComponent(String code, Component comp) {
- if (null == code) code = new String();
codes.put(comp,code);
}
diff -Nru filler-1.02/src/friendless/games/filler/Filler.java
filler-1.02/src/friendless/games/filler/Filler.java
--- filler-1.02/src/friendless/games/filler/Filler.java 2022-12-12
00:45:39.000000000 +0800
+++ filler-1.02/src/friendless/games/filler/Filler.java 2001-01-03
15:26:12.000000000 +0800
@@ -74,14 +74,8 @@
System.out.println("default locale is " + Locale.getDefault());
// load resources
resources =
ResourceBundle.getBundle("friendless.games.filler.resources", defaultLocale);
-
- String splashStr = resources.getString ("filler.filename.splash");
- java.net.URL splashUrl = Filler.class.getResource (splashStr);
- ImageIcon splashIcon = new ImageIcon (splashUrl);
- /* testing SableVM
ImageIcon splashIcon = new
ImageIcon(Filler.class.getResource(resources.getString("filler.filename.splash")));
- ** end testing */
- friendless.awt.SplashScreen splash =
friendless.awt.SplashScreen.show(splashIcon);
+ SplashScreen splash = SplashScreen.show(splashIcon);
EloRating.setResources(resources);
Tournaments.setResources(resources);
Filler f = new Filler();
diff -Nru filler-1.02/src/friendless/games/filler/FillerPanel.java
filler-1.02/src/friendless/games/filler/FillerPanel.java
--- filler-1.02/src/friendless/games/filler/FillerPanel.java 2022-12-12
00:45:39.000000000 +0800
+++ filler-1.02/src/friendless/games/filler/FillerPanel.java 2001-01-03
15:26:12.000000000 +0800
@@ -207,12 +207,7 @@
cancelButton.setEnabled(false);
playerNames[0].setEnabled(true);
playerNames[1].setEnabled(true);
- if (!PlayerRatings.save()) {
- // Display a dialog telling player to add self to "games" group.
- String h2h = resources.getString("filler.string.h2h");
- String mesg = resources.getString("filler.ratings.permissionmesg");
- showMessage(mesg, h2h);
- }
+ PlayerRatings.save();
}
/**
diff -Nru filler-1.02/src/friendless/games/filler/PlayerRatings.java
filler-1.02/src/friendless/games/filler/PlayerRatings.java
--- filler-1.02/src/friendless/games/filler/PlayerRatings.java 2022-12-12
00:45:39.000000000 +0800
+++ filler-1.02/src/friendless/games/filler/PlayerRatings.java 2001-01-03
15:26:12.000000000 +0800
@@ -29,7 +29,7 @@
* Filename of the file we store the ratings in.
* This file contains a Java-serialised instance of this class.
*/
- public static final String RATINGS_FILENAME = "filler.ratings";
+ public static final String RATINGS_FILENAME = "ratings.ser";
static final long serialVersionUID = -5410208778282312709L;
/** The singleton instance. */
static PlayerRatings theInstance;
@@ -134,8 +134,7 @@
}
}
- public static boolean save() {
- boolean canSave = false;
+ public static void save() {
try {
File f = new File(System.getProperty("user.dir") + File.separator
+ RATINGS_FILENAME);
//System.out.println("Saving ratings to " + f.getCanonicalPath());
@@ -144,13 +143,11 @@
oos.writeObject(theInstance);
oos.close();
fos.close();
- canSave = true;
} catch (Exception ex) {
System.out.println("In PlayerRatings.save");
System.out.println(System.getProperty("user.dir"));
ex.printStackTrace();
}
- return canSave;
}
}
diff -Nru filler-1.02/src/friendless/games/filler/TournamentPointsTableRow.java
filler-1.02/src/friendless/games/filler/TournamentPointsTableRow.java
--- filler-1.02/src/friendless/games/filler/TournamentPointsTableRow.java
2022-12-12 00:45:39.000000000 +0800
+++ filler-1.02/src/friendless/games/filler/TournamentPointsTableRow.java
2001-01-03 15:26:12.000000000 +0800
@@ -78,7 +78,7 @@
public int compareTo(TournamentPointsTableRow other) {
if (this.getWon() != other.getWon()) {
// wins aren't equal
- return (other.getWon() - this.getWon()); // use wins to seperate
teams
+ return (other.getWon() - this.getWon());; // use wins to seperate
teams
} else {
return (other.getDiff() - this.getDiff()); //else use goal
difference to seperate teams
}
OpenPGP_0x44173FA13D058888.asc
Description: OpenPGP public key
OpenPGP_signature
Description: OpenPGP digital signature
