[viruskiller] 01/01: Import Debian changes 1.03-1+dfsg1-2
Markus Koschany
apo at moszumanska.debian.org
Tue Nov 21 00:07:16 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository viruskiller.
commit d3f90c98956527eb9b56a91d42feceacc26cbab5
Author: Markus Koschany <apo at debian.org>
Date: Tue Nov 21 00:40:24 2017 +0100
Import Debian changes 1.03-1+dfsg1-2
viruskiller (1.03-1+dfsg1-2) unstable; urgency=medium
* Team upload.
[ Ansgar Burchardt ]
* Remove myself from Uploaders.
[ Markus Koschany ]
* Declare compliance with Debian Policy 4.1.1.
* Drop deprecated menu file. (Closes: #726900)
* d/copyright: Use https for Format field.
* Use canonical Vcs fields.
* Switch to compat level 10.
* Remove source/options file because xz compression is the default now.
* Remove Pre-Depends: dpkg (>= 1.15.6) line. Satisfied in all supported
distributions.
* Remove override for dh_builddeb.
* Apply reproducible-build.patch and make the build reproducible.
Thanks to Chris Lamb for the report and patch. (Closes: #860731)
* Fix Lintian warning copyright-refers-to-symlink-license and simply license
all Debian files under GPL-2+ like the rest of the program.
* Add keywords to desktop file.
---
debian/changelog | 23 ++++++++++-
debian/compat | 2 +-
debian/control | 9 ++---
debian/copyright | 10 +----
debian/patches/desktop-file.patch | 14 +++++--
debian/patches/reproducible-build.patch | 72 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 -
debian/source/options | 1 -
debian/viruskiller.menu | 2 -
10 files changed, 112 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 953cbcd..af4624f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,27 @@
-viruskiller (1.03-1+dfsg1-2) UNRELEASED; urgency=medium
+viruskiller (1.03-1+dfsg1-2) unstable; urgency=medium
+ * Team upload.
+
+ [ Ansgar Burchardt ]
* Remove myself from Uploaders.
- -- Ansgar Burchardt <ansgar at debian.org> Fri, 01 May 2015 01:03:20 +0200
+ [ Markus Koschany ]
+ * Declare compliance with Debian Policy 4.1.1.
+ * Drop deprecated menu file. (Closes: #726900)
+ * d/copyright: Use https for Format field.
+ * Use canonical Vcs fields.
+ * Switch to compat level 10.
+ * Remove source/options file because xz compression is the default now.
+ * Remove Pre-Depends: dpkg (>= 1.15.6) line. Satisfied in all supported
+ distributions.
+ * Remove override for dh_builddeb.
+ * Apply reproducible-build.patch and make the build reproducible.
+ Thanks to Chris Lamb for the report and patch. (Closes: #860731)
+ * Fix Lintian warning copyright-refers-to-symlink-license and simply license
+ all Debian files under GPL-2+ like the rest of the program.
+ * Add keywords to desktop file.
+
+ -- Markus Koschany <apo at debian.org> Tue, 21 Nov 2017 00:40:24 +0100
viruskiller (1.03-1+dfsg1-1) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7f8f011..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+10
diff --git a/debian/control b/debian/control
index 39d6a2c..5a60b85 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Stephen M. Webb <stephen.webb at bregmasoft.ca>
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends: debhelper (>= 10),
libsdl-image1.2-dev,
libsdl-mixer1.2-dev,
libsdl-net1.2-dev,
@@ -11,14 +11,13 @@ Build-Depends: debhelper (>= 7.0.50),
libsdl1.2-dev,
perl,
zlib1g-dev
-Standards-Version: 3.9.3
+Standards-Version: 4.1.1
Homepage: http://www.parallelrealities.co.uk/projects/virusKiller.php
-Vcs-Git: git://git.debian.org/git/pkg-games/viruskiller.git
-Vcs-Browser: http://git.debian.org/?p=pkg-games/viruskiller.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-games/viruskiller.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-games/viruskiller.git
Package: viruskiller
Architecture: any
-Pre-Depends: dpkg (>= 1.15.6)
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Game about viruses invading your computer
Your computer has been invaded! Dozens of little viruses are pouring in via
diff --git a/debian/copyright b/debian/copyright
index 8735ab0..a296795 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: Virus Killer
Upstream-Source: http://www.parallelrealities.co.uk/projects/virusKiller.php
@@ -54,7 +54,7 @@ Files: debian/*
Copyright:
© 2005, Florian Ragwitz <rafl at debianforum.de>
© 2008-2009, Ansgar Burchardt <ansgar at 43-1.org>
-License: GPL
+License: GPL-2+
License: GPL-2+
This program is free software; you can redistribute it and/or
@@ -70,9 +70,3 @@ License: GPL-2+
.
On Debian systems, the complete text of the GNU General Public License
can be found in `/usr/share/common-licenses/GPL-2'.
-
-License: GPL
- This software is licensed under the GNU General Public License.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/patches/desktop-file.patch b/debian/patches/desktop-file.patch
index 3cf5926..5ff7b39 100644
--- a/debian/patches/desktop-file.patch
+++ b/debian/patches/desktop-file.patch
@@ -3,18 +3,26 @@ Date: Mon, 11 Jan 2010 00:34:23 +0900
Subject: Update desktop file
Update desktop file so desktop-file-validate does no longer complain.
+---
+ icons/viruskiller.desktop | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/icons/viruskiller.desktop b/icons/viruskiller.desktop
+index 0156098..37f2c4e 100644
--- a/icons/viruskiller.desktop
+++ b/icons/viruskiller.desktop
@@ -1,9 +1,8 @@
[Desktop Entry]
-Encoding=UTF-8
-Categories=Application;Game;ArcadeGame;
+-X-Desktop-File-Install-Version=1.0
+Categories=Game;ArcadeGame;
- X-Desktop-File-Install-Version=1.0
Name=Virus Killer
-Icon=viruskiller.png
-+Icon=viruskiller
- Exec=/usr/games/viruskiller
+-Exec=/usr/games/viruskiller
-Terminal=0
++Icon=viruskiller
++Exec=viruskiller
+Terminal=false
Type=Application
++Keywords=arcade;virus;computer;
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
new file mode 100644
index 0000000..dd3ac21
--- /dev/null
+++ b/debian/patches/reproducible-build.patch
@@ -0,0 +1,72 @@
+--- viruskiller-1.03-1+dfsg1.orig/src/pak.cpp
++++ viruskiller-1.03-1+dfsg1/src/pak.cpp
+@@ -88,19 +88,19 @@ void countFiles(const char *dirName)
+
+ void recurseDirectory(const char *dirName)
+ {
+- DIR *dirp, *dirp2;
+- dirent *dfile;
++ int n;
++ DIR *dirp2;
+ gzFile fp;
+ FILE *infile;
+ char filename[1024];
++ struct dirent **namelist;
+
+ uLongf cSize = 0;
+ uLongf fSize = 0;
+
+- dirp = opendir(dirName);
+
+- if (dirp == NULL)
+- {
++ n = scandir(dirName, &namelist, NULL, alphasort);
++ if (n == -1) {
+ printf("%s: Directory does not exist or is not accessible\n", dirName);
+ return;
+ }
+@@ -108,14 +108,14 @@ void recurseDirectory(const char *dirNam
+ float percentage;
+ long filesize;
+
+- while ((dfile = readdir(dirp)))
++ while (n--)
+ {
+- if (dfile->d_name[0] == '.')
++ if (namelist[n]->d_name[0] == '.')
+ {
+ continue;
+ }
+
+- sprintf(filename, "%s/%s", dirName, dfile->d_name);
++ sprintf(filename, "%s/%s", dirName, namelist[n]->d_name);
+
+ dirp2 = opendir(filename);
+
+@@ -130,7 +130,7 @@ void recurseDirectory(const char *dirNam
+ if (!infile)
+ {
+ printf("Couldn't open %s for reading!\n", filename);
+- closedir(dirp);
++ free(namelist);
+ fclose(pak);
+ exit(1);
+ }
+@@ -162,7 +162,7 @@ void recurseDirectory(const char *dirNam
+ if (!fp)
+ {
+ printf("Couldn't open %s for reading!\n", filename);
+- closedir(dirp);
++ free(namelist);
+ fclose(pak);
+ exit(1);
+ }
+@@ -190,7 +190,7 @@ void recurseDirectory(const char *dirNam
+ }
+ }
+
+- closedir(dirp);
++ free(namelist);
+
+ dirs++;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 59d5893..83689ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ link-libz.patch
0009-start-with-fewer-directories.patch
0010-mismatched-delete.patch
0011-remove-bad-gzclose.patch
+reproducible-build.patch
diff --git a/debian/rules b/debian/rules
index 3797ce7..86782b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,5 +13,3 @@ override_dh_auto_install:
rm $(CURDIR)/debian/viruskiller/usr/share/doc/viruskiller/LICENSE \
$(CURDIR)/debian/viruskiller/usr/share/doc/viruskiller/README
-override_dh_builddeb:
- dh_builddeb -- -Zxz
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index 5bd47b7..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-compression = xz
diff --git a/debian/viruskiller.menu b/debian/viruskiller.menu
deleted file mode 100644
index 8b89fb6..0000000
--- a/debian/viruskiller.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(viruskiller):command="/usr/games/viruskiller" needs="X11" \
- section="Games/Action" title="Virus Killer"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/viruskiller.git
More information about the Pkg-games-commits
mailing list