[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Freeze exception for lightspeed/1.2a-9



Dear release team,

I ask for a freeze exception for lightspeed version 1.2a-9.

I have prepared few QA uploads. But unfortunately not all of them were
sponsored before freeze [1].

This update of the package does not fix any RC bug, but it fixes important,
normal and minor bugs. Also the quality of package was improved in common.

File in attachment was produced using command:

$ debdiff lightspeed_1.2a-8.dsc lightspeed_1.2a-9.dsc | \
    filterdiff -x '*config.guess' -x '*config.sub' > lightspeed_1.2a-8:1.2a-9.diff

It would be nice to see this updated package in Wheezy.

Best regards,
Boris

[1] http://bugs.debian.org/cgi-bin/pkgreport.cgi?include=subject%3A[QA];package=sponsorship-requests
reverted:
reverted:
diff -u lightspeed-1.2a/src/snapshot.c lightspeed-1.2a/src/snapshot.c
--- lightspeed-1.2a/src/snapshot.c
+++ lightspeed-1.2a/src/snapshot.c
@@ -28,6 +28,7 @@
 #ifdef HAVE_LIBPNG
 #include <png.h>
 static int write_png( int message, const void *data );
+#include <zlib.h>
 #endif
 
 #ifdef HAVE_LIBTIFF
@@ -305,7 +306,11 @@
 			return -1;
 		png_write_s = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
 		png_info_s = png_create_info_struct( png_write_s );
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+		if (setjmp(png_jmpbuf(png_write_s))) {
+#else
 		if (setjmp( png_write_s->jmpbuf )) {
+#endif
 			/* Error writing file */
 			png_destroy_write_struct( &png_write_s, &png_info_s );
 			fclose( png_fp );
diff -u lightspeed-1.2a/debian/rules lightspeed-1.2a/debian/rules
--- lightspeed-1.2a/debian/rules
+++ lightspeed-1.2a/debian/rules
@@ -2,81 +2,29 @@
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@ --parallel
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+override_dh_auto_configure:
+	ln -sf /usr/share/misc/config.guess config/config.guess
+	ln -sf /usr/share/misc/config.sub config/config.sub
+	dh_auto_configure -- --with-gtk=2 --with-ftgl
 
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-			--prefix=/usr --sysconfdir=/etc \
-			--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-		 --with-gtk=2 --with-ftgl
-	$(MAKE)
-	cd po ; $(MAKE) es.gmo
-	touch build-stamp
-
-clean:
-	dh_testdir
+override_dh_auto_clean:
 	dh_testroot
+	dh_auto_clean
 	rm -f build-stamp
-
-	# acconfig.h is deprecated  in latest autoconf !
-	-[ -r acconfig.h ] && echo '4993596279ab0801545005dbe6377ccb  acconfig.h' | md5sum -c - && rm -v acconfig.h
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
 	rm -f po/es.gmo po/stamp-po
+	rm -f config/config.guess config/config.sub
 
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-#	dh_installdirs
+override_dh_auto_build:
+	dh_auto_build -- LDFLAGS+=-Wl,--as-needed
+	cd po ; $(MAKE) es.gmo
 
-	# Add here commands to install the package into debian/lightspeed
+override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/lightspeed
 
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-#	dh_testversion
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf
-	dh_installdocs README  TODO MATH
-#	dh_installexamples
-	dh_installmenu
-	dh_installman debian/lightspeed.1
-#	dh_undocumented
-	dh_installchangelogs ChangeLog
-	dh_link
+.PHONY: override_dh_strip
+override_dh_strip:
 	dh_strip
-	dh_compress
-	dh_fixperms
-	# You may want to make some executables suid here.
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+get-orig-source:
+	uscan --noconf --verbose --force-download --rename --download-current-version --destdir=..
diff -u lightspeed-1.2a/debian/watch lightspeed-1.2a/debian/watch
--- lightspeed-1.2a/debian/watch
+++ lightspeed-1.2a/debian/watch
@@ -1,2 +1,3 @@
-version=2
-ftp://ftp2.sf.net/pub/sourceforge/l/li/lightspeed/lightspeed-(.*)\.tar\.gz
+version=3
+http://sf.net/lightspeed/lightspeed-(.+)\.tar\.gz \
+debian uupdate
diff -u lightspeed-1.2a/debian/copyright lightspeed-1.2a/debian/copyright
--- lightspeed-1.2a/debian/copyright
+++ lightspeed-1.2a/debian/copyright
@@ -1,4 +1,4 @@
-This package was debianized by Nicolás Lichtmaier <nick@debian.org> on
+This package was debianized by Nicolás Lichtmaier <nick@debian.org> on
 Sun,  9 Apr 2000 04:28:13 -0300.
 
 Downloaded from:
diff -u lightspeed-1.2a/debian/compat lightspeed-1.2a/debian/compat
--- lightspeed-1.2a/debian/compat
+++ lightspeed-1.2a/debian/compat
@@ -1 +1 @@
-4
+9
diff -u lightspeed-1.2a/debian/changelog lightspeed-1.2a/debian/changelog
--- lightspeed-1.2a/debian/changelog
+++ lightspeed-1.2a/debian/changelog
@@ -1,3 +1,44 @@
+lightspeed (1.2a-9) unstable; urgency=low
+
+  * QA upload.
+  * Bumped Standards-Version to 3.9.3 (was 3.7.2.0).
+  * Bumped debhelper version to 9 (was 4.0.0); updated debian/compat.
+  * Added file debian/source/format: format 1.0 is still used in this package.
+  * Added files debian/docs and debian/manpages to simplify debian/rules.
+  * Deleted files config/config.guess and config/config.sub.
+    Files from the package autotools-dev are used instead.
+  * Rewritten debian/rules:
+    - now dh is used instead of direct dh_* commands
+    - added --as-needed option to LDFLAGS
+    - added section get-orig-source (uscan is used)
+    - used symlinks for config/config.guess and config/config.sub
+    - fixed lintian warnings:
+      + hardening-no-relro
+      + hardening-no-fortify-functions
+      + debian-rules-ignores-make-clean-error
+      + debian-rules-missing-recommended-target build-arch
+      + debian-rules-missing-recommended-target build-indep
+      + dh-clean-k-is-deprecated
+  * Updated debian/control:
+    - added Homepage field
+    - changed build dependency from libpng12-dev to libpng-dev (Closes: #662418)
+    - changed build dependency from ftgl-dev to libftgl-dev (Closes: #485799)
+    - added build dependency from autotools-dev
+    - added ${misc:Depends} to list of dependencies
+    - lightspeed now suggests recommended font ttf-dejavu instead of font
+      ttf-bitstream-vera which is going to be removed from the repository
+      (Closes: #461272)
+  * Updated debian/copyright: fixed lintian warning
+    debian-copyright-file-uses-obsolete-national-encoding.
+  * Updated debian/watch: fixed lintian warning
+    debian-watch-file-should-use-sf-redirector. (Closes: #449901)
+  * Patched file src/snapshot.c. [Thanks to Nobuhiro Iwamatsu] (Closes: #649787)
+    But build with libpng version 1.5.10 now impossible because
+    `pkg-config --cflags gtk+-2.0` returns error:
+    "Package 'libpng12', required by 'GdkPixbuf', not found"
+
+ -- Boris Pek <tehnick-8@mail.ru>  Thu, 28 Jun 2012 18:25:29 +0300
+
 lightspeed (1.2a-8) unstable; urgency=low
 
   * Package maintainer set to Debian QA Group <packages@qa.debian.org>.
diff -u lightspeed-1.2a/debian/control lightspeed-1.2a/debian/control
--- lightspeed-1.2a/debian/control
+++ lightspeed-1.2a/debian/control
@@ -2,13 +2,18 @@
 Section: misc
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Standards-Version: 3.7.2.0
-Build-Depends: debhelper (>> 4.0.0), libgtkglext1-dev, libgtk2.0-dev, libpng12-dev, libtiff4-dev, libxi-dev, zlib1g-dev, libgl1-mesa-dev | libgl-dev, ftgl-dev, libfontconfig1-dev
+Build-Depends: debhelper (>> 9), autotools-dev,
+ libgtkglext1-dev, libgtk2.0-dev,
+ libpng-dev, libtiff4-dev, libxi-dev, zlib1g-dev,
+ libgl1-mesa-dev | libgl-dev, libftgl-dev,
+ libfontconfig1-dev
+Homepage: http://lightspeed.sourceforge.net/
+Standards-Version: 3.9.3
 
 Package: lightspeed
 Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: ttf-freefont | ttf-bitstream-vera
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Suggests: ttf-freefont | ttf-dejavu
 Description: Shows how objects moving at relativistic speeds look like
  Light Speed! is an OpenGL-based program which illustrates the effects of
  special relativity on the appearance of moving objects. When an object
only in patch2:
unchanged:
--- lightspeed-1.2a.orig/debian/manpages
+++ lightspeed-1.2a/debian/manpages
@@ -0,0 +1 @@
+debian/*.1
only in patch2:
unchanged:
--- lightspeed-1.2a.orig/debian/docs
+++ lightspeed-1.2a/debian/docs
@@ -0,0 +1,3 @@
+README
+TODO
+MATH
only in patch2:
unchanged:
--- lightspeed-1.2a.orig/debian/source/format
+++ lightspeed-1.2a/debian/source/format
@@ -0,0 +1 @@
+1.0

Reply to: