[SCM] pcsxr packaging branch, master, updated. debian/1.9.92-3-13-g4ac25d7

[Andrey Rahmatullin]

The following commit has been merged in the master branch:
commit 7f85afed0c2d21370edda97369892e1a57ec1f12
Author: Andrey Rahmatullin <wrar at wrar.name>
Date:   Fri Jun 15 22:55:41 2012 +0600

    Switch to debhelper level 9, enable all hardening options.

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 0beb5bb..1624d31 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: Andrey Rahmatullin <wrar at wrar.name>
-Build-Depends: debhelper (>= 8), dh-autoreconf, nasm [i386],
+Build-Depends: debhelper (>= 9), dh-autoreconf, nasm [i386],
  libgtk2.0-dev, libglade2-dev, zlib1g-dev, libxv-dev, libxtst-dev,
  libgl1-mesa-dev, libxxf86vm-dev, libsdl1.2-dev
 Standards-Version: 3.9.2
@@ -13,6 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/pcsxr.git;a=summary
 
 Package: pcsxr
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: pcsx, pcsx-bin, pcsx-i18n, psemu-drive-cdrmooby, psemu-input-omnijoy, psemu-input-padjoy, psemu-sound-alsa, psemu-sound-oss, psemu-video-x11
 Conflicts: pcsx, pcsx-bin, pcsx-i18n, psemu-drive-cdrmooby, psemu-input-omnijoy, psemu-input-padjoy, psemu-sound-alsa, psemu-sound-oss, psemu-video-x11, pcsx-df
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
new file mode 100644
index 0000000..1a5119d
--- /dev/null
+++ b/debian/patches/format-security.patch
@@ -0,0 +1,56 @@
+Description: Fix multiple "format not a string literal" warnings
+Author: Andrey Rahmatullin <wrar at wrar.name>
+Forwarded: no
+Last-Update: 2012-06-15
+
+diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
+index 89da504..2e556c7 100644
+--- a/gui/Gtk2Gui.c
++++ b/gui/Gtk2Gui.c
+@@ -917,7 +917,7 @@ void SysErrorMessage(gchar *primary, gchar *secondary) {
+ 				primary,
+ 				NULL);
+ 		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog),
+-				secondary);
++				"%s", secondary);
+ 
+ 		gtk_dialog_run(GTK_DIALOG(message_dialog));
+ 		gtk_widget_destroy(message_dialog);
+@@ -936,7 +936,7 @@ void SysInfoMessage(gchar *primary, gchar *secondary) {
+ 				primary,
+ 				NULL);
+ 		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog),
+-				secondary);
++				"%s", secondary);
+ 
+ 		gtk_dialog_run(GTK_DIALOG(message_dialog));
+ 		gtk_widget_destroy(message_dialog);
+diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
+index ebfe629..74954f0 100644
+--- a/libpcsxcore/psxcounters.c
++++ b/libpcsxcore/psxcounters.c
+@@ -100,7 +100,7 @@ void verboseLog( s32 level, const char *str, ... )
+         vsprintf( buf, str, va );
+         va_end( va );
+ 
+-        printf( buf );
++        printf( "%s", buf );
+         fflush( stdout );
+     }
+ }
+diff --git a/plugins/peopsxgl/draw.c b/plugins/peopsxgl/draw.c
+index 33381e5..cca1463 100644
+--- a/plugins/peopsxgl/draw.c
++++ b/plugins/peopsxgl/draw.c
+@@ -545,9 +545,9 @@ int GLinitialize()
+  glPixelTransferi(GL_ALPHA_SCALE, 1);
+  glPixelTransferi(GL_ALPHA_BIAS, 0);                                                  
+ 
+- printf(glGetString(GL_VENDOR));                       // linux: tell user what is getting used
++ printf("%s", glGetString(GL_VENDOR));                       // linux: tell user what is getting used
+  printf("\n");
+- printf(glGetString(GL_RENDERER));
++ printf("%s", glGetString(GL_RENDERER));
+  printf("\n");
+ 
+  glFlush();                                            // we are done...
diff --git a/debian/patches/series b/debian/patches/series
index 6ace374..bc9a685 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ disable-ppc-auto-dynarec.patch
 fix-pcsx-link.patch
 fix-plugin-dir.patch
 update-homedir-symlinks.patch
+format-security.patch
diff --git a/debian/pcsxr.install b/debian/pcsxr.install
index 5ca49a1..c5c5f78 100644
--- a/debian/pcsxr.install
+++ b/debian/pcsxr.install
@@ -1,4 +1,4 @@
-/usr/lib/psemu/
+/usr/lib/*/psemu/
 /usr/games/pcsx
 /usr/share/psemu/
 /usr/share/locale/
diff --git a/debian/rules b/debian/rules
index a0f04a8..ad62ead 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,10 @@
 
 .PHONY: override_dh_auto_configure override_dh_auto_install override_dh_install override_dh_strip
 
-export LDFLAGS=-Wl,--as-needed
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 
 %:
 	dh $@ --parallel --with autoreconf
@@ -12,7 +15,7 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	dh_auto_install --parallel
-	rm -f $(CURDIR)/debian/tmp/usr/lib/psemu/*.la
+	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/psemu/*.la
 
 override_dh_install:
 	dh_install --fail-missing

-- 
pcsxr packaging