-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Control: tags -1 patch
Hi Ben
On Sun, 27 Sep 2015 18:54:29 -0300 Ben Armstrong
<sy...@sanctuary.nslug.ns.ca> wrote:
> I'd really like to see xletters go to a good home. I mentioned
> last month there's a good chance Debian would be better off
> switching upstreams to one that supports Unicode (see #798004) and
> today I just received this. As our own kids have not used this
> software since longer ago than when I last did anything for this
> package, I'd like to put one last call here, to the Debian Jr. and
> Edu lists before I simply orphan the package. I hope someone new
> would like to bring new energy to looking after what was certainly
> a favourite of my kids when they were very young.
>
> Please contact me if you would like to take over xletters.
I did some refactor of the package, and I guess now at least the two
bugs #800238 and #288603 are fixed, meaning that we use a newer compat
level and a clean packaging style.
How do you feel about uploading it?
to switch on a new xletters home let me know if you want it, but in
this case I might ask you to maintain the package under pkg-gamesdevel
umbrella
cheers,
Gianfranco
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBCAAGBQJWCoWpAAoJEPNPCXROn13ZW5QP/0e4AJ0EwuIaTvJERp600NIZ
csf/Cr502SFuuYxxT+RRhIqcjr/I8wH6f48z6rYwSy2wukKpu5dMNz8nOBUYq93Q
WGzMH3ZKE8DdsrLjCdg1os+TMtM/W8JTxMtd96TO4QnUG1JfvO/vifLtX0BeR7IA
qbs+ZXOZpBCWEu79FxhDOLafriZqSzSnTsjhCw8PEiDYd/FCMmHQscv3VYZvHLRw
ifAQ1XQe5njHnGjIi6UfUhg1biazmwgtCVD1l+pdyUngOnbKuVtsn3gEA+NS9dNY
292biPWo3dUj1QldN7MFWz9VlkZr/KwQQAm/14zu3nCJ6s0yKLlYJJJmsBG0ZyHK
xXFUfM0EPVJtGGb2IQ0tyzs3Y7qOO8CT9KBMJBrgAk8NxCnhIxqk7TaLSNJmvhB+
s25p47rcM1Kr3FtqO8PMVziYK18Oi8FkW2cmAUOaJj1NubiP6g2GRaqvakFJt2Yl
QhZJPww/or3DcIyWklpVHX/iFYEhKIAI3TP9nrrIcmypiqc1vXEvQAVaiOCeHRaQ
FlOPV4OmI1dzQBu2F2zqhmSn8G1muCcZEzZHvyyWOIhfdICFY9nihyUvON+lZ+r0
jaETmtrCWz5nhtF+HZfJs5OtZcNT54hJbw4t2zsqpb5tvb0X8zj1YLpJe1BdrrPT
PeuyA1eYFspxlZ2qgDDo
=a0Ce
-----END PGP SIGNATURE-----
diff -Nru xletters-1.1.1/debian/changelog xletters-1.1.1/debian/changelog
--- xletters-1.1.1/debian/changelog 2015-09-29 14:30:45.000000000 +0200
+++ xletters-1.1.1/debian/changelog 2015-09-29 14:30:26.000000000 +0200
@@ -1,3 +1,14 @@
+xletters (1.1.1-4.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Bump std-version to 3.9.6, no changes required.
+ * Use dh-autoreconf
+ * Use quilt format, and refactor rules file in new dh style.
+ * Bump compat level to 9. (Closes: #800238)
+ * Remove menu file, not used in Debian anymore. (Closes: #288603)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Tue, 29 Sep 2015
13:20:20 +0200
+
xletters (1.1.1-4.1) unstable; urgency=low
* Non-maintainer upload to help xlibs-dev transition.
diff -Nru xletters-1.1.1/debian/compat xletters-1.1.1/debian/compat
--- xletters-1.1.1/debian/compat 1970-01-01 01:00:00.000000000 +0100
+++ xletters-1.1.1/debian/compat 2015-09-29 13:17:48.000000000 +0200
@@ -0,0 +1 @@
+9
diff -Nru xletters-1.1.1/debian/control xletters-1.1.1/debian/control
--- xletters-1.1.1/debian/control 2015-09-29 14:30:45.000000000 +0200
+++ xletters-1.1.1/debian/control 2015-09-29 13:19:11.000000000 +0200
@@ -2,8 +2,8 @@
Section: games
Priority: optional
Maintainer: Ben Armstrong <sy...@sanctuary.nslug.ns.ca>
-Build-Depends: debhelper (>> 3.0.0), libx11-dev, libxt-dev, libxaw7-dev
-Standards-Version: 3.5.2
+Build-Depends: debhelper (>= 9), libx11-dev, libxt-dev, libxaw7-dev,
dh-autoreconf
+Standards-Version: 3.9.6
Package: xletters
Architecture: any
diff -Nru xletters-1.1.1/debian/menu xletters-1.1.1/debian/menu
--- xletters-1.1.1/debian/menu 2015-09-29 14:30:45.000000000 +0200
+++ xletters-1.1.1/debian/menu 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-?package(xletters):needs=X11 section=Games/Arcade\
- title="xletters" command="/usr/games/xletters"
-?package(xletters):needs=X11 section=Games/Arcade\
- title="xletters-duel" command="/usr/games/xletters-duel"
diff -Nru xletters-1.1.1/debian/patches/remove-data-hook.patch
xletters-1.1.1/debian/patches/remove-data-hook.patch
--- xletters-1.1.1/debian/patches/remove-data-hook.patch 1970-01-01
01:00:00.000000000 +0100
+++ xletters-1.1.1/debian/patches/remove-data-hook.patch 2015-09-29
13:51:45.000000000 +0200
@@ -0,0 +1,18 @@
+Description: due to a permission issue this file is installed during postinst
+--- xletters-1.1.1.orig/Makefile.am
++++ xletters-1.1.1/Makefile.am
+@@ -12,9 +12,9 @@ man_MANS = xletters.6
+
+ EXTRA_DIST = xletters.6 xletters-duel xletters.spec.in
+
+-install-data-hook:
+- $(INSTALL) -d -m 755 $(DESTDIR)/var/local/games/lib/xletters
+- touch scores
+- $(INSTALL) -m 666 scores $(DESTDIR)/var/local/games/lib/xletters/scores
+- rm -f scores
++#install-data-hook:
++# $(INSTALL) -d -m 755 $(DESTDIR)/var/local/games/lib/xletters
++# touch scores
++# $(INSTALL) -m 666 scores $(DESTDIR)/var/local/games/lib/xletters/scores
++# rm -f scores
+
diff -Nru xletters-1.1.1/debian/patches/series
xletters-1.1.1/debian/patches/series
--- xletters-1.1.1/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ xletters-1.1.1/debian/patches/series 2015-09-29 13:51:25.000000000
+0200
@@ -0,0 +1,2 @@
+xletters.patch
+remove-data-hook.patch
diff -Nru xletters-1.1.1/debian/patches/xletters.patch
xletters-1.1.1/debian/patches/xletters.patch
--- xletters-1.1.1/debian/patches/xletters.patch 1970-01-01
01:00:00.000000000 +0100
+++ xletters-1.1.1/debian/patches/xletters.patch 2015-09-29
13:57:15.000000000 +0200
@@ -0,0 +1,27 @@
+Description: adapt files to Debian paths
+--- xletters-1.1.1.orig/xletters.6
++++ xletters-1.1.1/xletters.6
+@@ -366,10 +366,10 @@ above).
+ .PP
+ (If not overriden at compile time)
+ .TP
+-.B /usr/dict/words
++.B /usr/share/dict/words
+ The dictionary of words.
+ .TP
+-.B /var/local/games/lib/xletters/scores
++.B /var/games/xletters/scores
+ The high score table.
+ .SH "CONFIGURATION SUGGESTION"
+ .PP
+--- xletters-1.1.1.orig/xletters.h
++++ xletters-1.1.1/xletters.h
+@@ -63,7 +63,7 @@
+ #define WORDPATH
"/usr/share/dict:/usr/local/share/dict:/usr/dict:~/dict:~/.:~/share/dict:."
+
+ /* The high score file */
+-#define SCOREFILE "/var/local/games/lib/xletters/scores"
++#define SCOREFILE "/var/games/xletters/scores"
+ /* ***NOTE*** You are responsible for creating the directory.
+ * xletters will create the file if necessary, but it might not have
+ * the right owner, so you had better create it too. */
diff -Nru xletters-1.1.1/debian/rules xletters-1.1.1/debian/rules
--- xletters-1.1.1/debian/rules 2015-09-29 14:30:45.000000000 +0200
+++ xletters-1.1.1/debian/rules 2015-09-29 13:56:20.000000000 +0200
@@ -1,61 +1,9 @@
#!/usr/bin/make -f
-# GNU copyright 2001 by Ben Armstrong.
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export DH_COMPAT=3
+%:
+ dh $@ --with autoreconf
-configure: config.status
-config.status:
- dh_testdir
-
- ./configure --prefix=/usr --mandir=\$${prefix}/share/man
-
-build: config.status build-stamp
-build-stamp:
- dh_testdir
-
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- -$(MAKE) distclean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) install-exec install-man prefix=$(CURDIR)/debian/xletters/usr \
- bindir=$(CURDIR)/debian/xletters/usr/games
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installmenu
- dh_installman
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_install:
+ dh_auto_install -- bindir=/usr/games
diff -Nru xletters-1.1.1/debian/source/format
xletters-1.1.1/debian/source/format
--- xletters-1.1.1/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ xletters-1.1.1/debian/source/format 2015-09-29 13:18:26.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru xletters-1.1.1/xletters.6 xletters-1.1.1/xletters.6
--- xletters-1.1.1/xletters.6 2015-09-29 14:30:45.000000000 +0200
+++ xletters-1.1.1/xletters.6 1998-11-06 00:58:13.000000000 +0100
@@ -366,10 +366,10 @@
.PP
(If not overriden at compile time)
.TP
-.B /usr/share/dict/words
+.B /usr/dict/words
The dictionary of words.
.TP
-.B /var/games/xletters/scores
+.B /var/local/games/lib/xletters/scores
The high score table.
.SH "CONFIGURATION SUGGESTION"
.PP
diff -Nru xletters-1.1.1/xletters.h xletters-1.1.1/xletters.h
--- xletters-1.1.1/xletters.h 2015-09-29 14:30:45.000000000 +0200
+++ xletters-1.1.1/xletters.h 2001-05-09 07:05:42.000000000 +0200
@@ -63,7 +63,7 @@
#define WORDPATH
"/usr/share/dict:/usr/local/share/dict:/usr/dict:~/dict:~/.:~/share/dict:."
/* The high score file */
-#define SCOREFILE "/var/games/xletters/scores"
+#define SCOREFILE "/var/local/games/lib/xletters/scores"
/* ***NOTE*** You are responsible for creating the directory.
* xletters will create the file if necessary, but it might not have
* the right owner, so you had better create it too. */
