[Pkg-sdl-commits] [libsdl-sge] 01/01: Changes for -4
Manuel A. Fernandez Montecelo
mafm at alioth.debian.org
Sat Aug 17 23:48:53 UTC 2013
This is an automated email from the git hooks/post-receive script.
mafm pushed a commit to branch master
in repository libsdl-sge.
commit c0c012b61442a4c84abe82134ede7d8dde02b3a1
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date: Sat Aug 17 23:50:08 2013 +0100
Changes for -4
---
debian/changelog | 16 ++++++++++++++++
debian/control | 7 ++-----
debian/patches/001_makefile_fixes.diff | 19 +++++++++++++++++--
debian/rules | 11 ++++++++---
4 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cb7c832..fcfd8ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+libsdl-sge (030809dfsg-4) unstable; urgency=low
+
+ * debian/rules:
+ - Override dh_compress to not compress files under examples/ (they are tiny
+ and cause issues with Multi-arch) (Closes: #720028)
+ - Enable more parts of build hardening by passing default LDFLAGS as well as
+ CFLAGS (the basic build system did not account for this). Also had to
+ modify patch 001_makefile_fixes.diff in the process.
+ * debian/control:
+ - Bump Policy Standars-Version to 3.9.4 (no changes needed)
+ - Change maintainer address to @debian.org
+ - Remove obsolete "DM-Upload-Allowed: yes"
+ - Remove now unneeded Build-Depends on "dpkg-dev (>= 1.16.1~)"
+
+ -- Manuel A. Fernandez Montecelo <mafm at debian.org> Sat, 17 Aug 2013 23:43:32 +0100
+
libsdl-sge (030809dfsg-3) unstable; urgency=low
* Complete overhaul of the package:
diff --git a/debian/control b/debian/control
index 554d03d..b250f55 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,15 @@
Source: libsdl-sge
Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
-Uploaders: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
+Uploaders: Manuel A. Fernandez Montecelo <mafm at debian.org>
Section: libs
Priority: optional
Build-Depends: debhelper (>= 9~),
- dpkg-dev (>= 1.16.1~),
libfreetype6-dev (>= 2.4.2),
libsdl1.2-dev (>= 1.2.14~),
libsdl-image1.2-dev (>= 1.2.12~)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-sdl/packages/libsdl-sge.git
Vcs-Git: git://anonscm.debian.org/pkg-sdl/packages/libsdl-sge.git
-DM-Upload-Allowed: yes
Homepage: http://www.digitalfanatics.org/cal/sge/
Package: libsdl-sge
@@ -44,4 +42,3 @@ Description: extension of graphic functions for the SDL multimedia, development
.
This package contains the header files and static library needed to
compile applications that use libsdl-sge.
-
diff --git a/debian/patches/001_makefile_fixes.diff b/debian/patches/001_makefile_fixes.diff
index 36a045c..40465e1 100644
--- a/debian/patches/001_makefile_fixes.diff
+++ b/debian/patches/001_makefile_fixes.diff
@@ -1,6 +1,14 @@
--- a/Makefile
+++ b/Makefile
-@@ -11,7 +11,7 @@
+@@ -4,6 +4,7 @@
+
+ CFLAGS += $(SGE_CFLAGS) -fPIC $(FT_CFLAGS)
+ LIBS =$(SGE_LIBS)
++LDFLAGS += $(CUSTOM_LDFLAGS)
+
+ SGE_VER = 030809
+ API_VER = 0
+@@ -11,13 +12,13 @@
OBJECTS=sge_surface.o sge_primitives.o sge_tt_text.o sge_bm_text.o sge_misc.o sge_textpp.o sge_blib.o sge_rotation.o sge_collision.o sge_shape.o
all: config $(OBJECTS)
@@ -9,7 +17,14 @@
$(OBJECTS): %.o:%.cpp %.h #Each object depends on thier .cpp and .h file
$(CXX) $(CFLAGS) -c $<
-@@ -31,7 +31,7 @@
+
+ shared: all
+- $(CXX) $(CFLAGS) -Wl,-soname,libSGE.so.$(API_VER) -fpic -fPIC -shared -o libSGE.so $(OBJECTS) $(LIBS)
++ $(CXX) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libSGE.so.$(API_VER) -fpic -fPIC -shared -o libSGE.so $(OBJECTS) $(LIBS)
+
+ shared-strip: shared
+ @strip libSGE.so
+@@ -31,7 +32,7 @@
@strip SGE.dll
clean:
diff --git a/debian/rules b/debian/rules
index 286c410..8813050 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,9 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--no-undefined -Wl,--as-needed $(shell dp
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
LIB_MULTIARCH_DIR = /usr/lib/$(DEB_HOST_MULTIARCH)
-ALL_CUSTOM_FLAGS := $(DEB_CFLAGS_MAINT) $(DEB_CFLAGS_MAINT_APPEND) $(DEB_LDFLAGS_MAINT) $(DEB_LDFLAGS_MAINT_APPEND)
+
+ALL_CUSTOM_CFLAGS := $(DEB_CFLAGS_MAINT) $(DEB_CFLAGS_MAINT_APPEND)
+ALL_CUSTOM_LDFLAGS := $(DEB_LDFLAGS_MAINT) $(DEB_LDFLAGS_MAINT_APPEND)
%:
@@ -20,13 +22,13 @@ ALL_CUSTOM_FLAGS := $(DEB_CFLAGS_MAINT) $(DEB_CFLAGS_MAINT_APPEND) $(DEB_LDFLAGS
override_dh_auto_build:
# Build the static library and make a backup
rm -f libSGE.a
- $(MAKE) all CUSTOM_CFLAGS="$(ALL_CUSTOM_FLAGS)"
+ $(MAKE) all CUSTOM_CFLAGS="$(ALL_CUSTOM_CFLAGS)" CUSTOM_LDFLAGS="$(ALL_CUSTOM_LDFLAGS)"
rm -f libSGE.bak
mv libSGE.a libSGE.bak
# Build the shared library and restore the static backup
$(MAKE) clean
- $(MAKE) shared CUSTOM_CFLAGS="$(ALL_CUSTOM_FLAGS)"
+ $(MAKE) shared CUSTOM_CFLAGS="$(ALL_CUSTOM_CFLAGS)" CUSTOM_LDFLAGS="$(ALL_CUSTOM_LDFLAGS)"
rm -f libSGE.a
mv libSGE.bak libSGE.a
@@ -39,5 +41,8 @@ override_dh_auto_install:
mv ./debian/tmp/usr/lib/libSGE*.a $(CURDIR)/debian/tmp/$(LIB_MULTIARCH_DIR)
mv ./debian/tmp/usr/lib/libSGE*.so* $(CURDIR)/debian/tmp/$(LIB_MULTIARCH_DIR)
+override_dh_compress:
+ dh_compress -Xexamples/
+
override_dh_makeshlibs:
dh_makeshlibs -V 'libsdl-sge (>= 030809-1)'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl-sge.git
More information about the pkg-sdl-commits
mailing list