Bug#774420: unblock: virtualjaguar/2.1.2-2
Package: release.debian.org
Severity: normal
Tags: patch
User: release.debian.org@packages.debian.org
Usertags: unblock
Hello!
The current version 2.1.2-1 of virtualjaguar in testing contains a
minor bug which results in the actual version incorrectly displayed
in the main application window and about dialog. Thus, even though
the actual upstream version number is 2.1.2, the program incorrectly
reports the version number to be 2.1.0.
This is because the actual version number has to be set manually
in a Debian-specific patch and we forgot to raise the version
number to 2.1.2 while importing the latest upstream version.
The current version 2.1.2-2 in unstable fixes this issue. It would
be nice to have this fix unblocked so that users of the version
in Jessie are not confused when running the emulator and file
bug reports asking for a newer upstream version.
I am attaching the debdiff which shows some more smaller changes
which are all just formatting and text clean-ups in the debian/rules,
debian/control and debian/changelog files. I know we are not
supposed to do that, but I am just a very tidy maintainer and
wanted to clean a bit up after my fellow maintainer. Sorry!
However, no actual code was changed except for raising VJ_RELEASE_VERSION
in debian/patches/10-add-version-file.patch from 2.1.0 to 2.1.2, so
unblocking the version from unstable should be fine.
Cheers,
Adrian
unblock virtualjaguar/2.1.2-2
-- System Information:
Debian Release: 8.0
APT prefers testing
APT policy: (500, 'testing'), (99, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru virtualjaguar-2.1.2/debian/changelog virtualjaguar-2.1.2/debian/changelog
--- virtualjaguar-2.1.2/debian/changelog 2014-10-11 13:40:10.000000000 +0200
+++ virtualjaguar-2.1.2/debian/changelog 2014-12-29 16:14:30.000000000 +0100
@@ -1,13 +1,23 @@
+virtualjaguar (2.1.2-2) unstable; urgency=medium
+
+ * Update VJ_RELEASE_VERSION in debian/patches/
+ 10-add-version-file.patch to 2.1.2.
+
+ -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> Mon, 29 Dec 2014 16:12:44 +0100
+
virtualjaguar (2.1.2-1) unstable; urgency=medium
- * Fix watch file (missing 2 from bz2), and scan for numeric versions.
- * Import upstream version 2.1.1.
- * Add myself as uploader.
- * Use verbose output from makefiles.
- * Fix location of README file.
- * Drop patches integrated in new upstream release.
- * Import upstream version 2.1.2.
- * Install 32x32 pixel version of the icon for menu.
+ * New upstream release.
+ * Fix typo and scan for numeric versions in URL in debian/watch.
+ * Add myself to the list of uploaders in debian/control.
+ * Add V=1 during builds to enable verbose output in debian/rules.
+ * Fix path of README file in debian/docs.
+ * Don't use icon in debian/menu as it is too large.
+ * Drop debian/patches/50-hurd-support.patch, merged upstream.
+ * Drop debian/patches/40-kfreebsd-support.patch, merged upstream.
+ * Drop debian/patches/30-use-xdg-data-dir.patch, merged upstream.
+ * Drop debian/patches/20-fix-linker-paths.patch, merged upstream.
+ * Install 32x32 pixel version of the program icon for the Debian menu.
-- Teemu Hukkanen <tjhukkan@iki.fi> Sat, 11 Oct 2014 12:11:47 +0100
diff -Nru virtualjaguar-2.1.2/debian/control virtualjaguar-2.1.2/debian/control
--- virtualjaguar-2.1.2/debian/control 2014-10-10 19:45:11.000000000 +0200
+++ virtualjaguar-2.1.2/debian/control 2014-12-29 16:04:59.000000000 +0100
@@ -3,11 +3,7 @@
Priority: optional
Maintainer: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Uploaders: Teemu Hukkanen <tjhukkan@iki.fi>
-Build-Depends: debhelper (>= 9.0.0),
- libqt4-dev,
- libqt4-opengl-dev,
- libsdl1.2-dev,
- netpbm
+Build-Depends: debhelper (>= 9.0.0), libqt4-dev, libqt4-opengl-dev, libsdl1.2-dev, netpbm
Standards-Version: 3.9.6
Homepage: http://icculus.org/virtualjaguar/
Vcs-Git: git://github.com/glaubitz/virtualjaguar-debian.git
diff -Nru virtualjaguar-2.1.2/debian/install virtualjaguar-2.1.2/debian/install
--- virtualjaguar-2.1.2/debian/install 2014-10-10 19:45:35.000000000 +0200
+++ virtualjaguar-2.1.2/debian/install 2014-12-29 16:04:59.000000000 +0100
@@ -1,4 +1,4 @@
virtualjaguar usr/bin
debian/virtualjaguar.desktop usr/share/applications
-debian/vj-32x32.xpm usr/share/pixmaps
res/vj.xpm usr/share/pixmaps
+debian/vj-32x32.xpm usr/share/pixmaps
diff -Nru virtualjaguar-2.1.2/debian/patches/10-add-version-file.patch virtualjaguar-2.1.2/debian/patches/10-add-version-file.patch
--- virtualjaguar-2.1.2/debian/patches/10-add-version-file.patch 2014-10-09 14:55:51.000000000 +0200
+++ virtualjaguar-2.1.2/debian/patches/10-add-version-file.patch 2014-12-29 16:09:16.000000000 +0100
@@ -2,12 +2,12 @@
The original source tarball is missing the version.h header
file which defines VJ_RELEASE_VERSION and VJ_RELEASE_SUBVERSION.
This patch adds that file, defining the release version as
- 2.1.0 which is the current upstream version and sets the
+ 2.1.2 which is the current upstream version and sets the
sub-version as "debian" to indicate that this source has been
built for Debian.
--- /dev/null
+++ virtualjaguar-2.1.0/version.h
@@ -0,0 +1,2 @@
-+#define VJ_RELEASE_VERSION "2.1.0"
++#define VJ_RELEASE_VERSION "2.1.2"
+#define VJ_RELEASE_SUBVERSION "debian"
diff -Nru virtualjaguar-2.1.2/debian/rules virtualjaguar-2.1.2/debian/rules
--- virtualjaguar-2.1.2/debian/rules 2014-10-11 12:45:51.000000000 +0200
+++ virtualjaguar-2.1.2/debian/rules 2014-12-29 16:04:59.000000000 +0100
@@ -10,10 +10,11 @@
make -f jaguarcore.mak V=1
make -C src/m68000 V=1
dh_auto_build -- V=1
- # Convert icon to 32x32 for menu
+
+# Convert icon to 32x32 for menu
xpmtoppm res/vj.xpm | \
- pnmscale -xsize 32 -ysize 32 | \
- ppmtoxpm -name vj_xpm-32x32 > debian/vj-32x32.xpm
+ pnmscale -xsize 32 -ysize 32 | \
+ ppmtoxpm -name vj_xpm-32x32 > debian/vj-32x32.xpm
# install docs/WHATSNEW as changelog.gz (Debian Policy 12.7)
override_dh_installchangelogs:
Reply to: