[SCM] Packaging for quesoglc branch, master, updated. debian/0.7.1-1-6-g95841c8
Bradley Smith
brad at brad-smith.co.uk
Fri Jul 4 23:01:46 UTC 2008
The following commit has been merged in the master branch:
commit 95841c8f4dbfa53e3a4c4535e9142f123d5e52e6
Author: Bradley Smith <brad at brad-smith.co.uk>
Date: Fri Jul 4 23:46:33 2008 +0100
Add 00_fix_as-needed.diff.
Signed-off-by: Bradley Smith <brad at brad-smith.co.uk>
diff --git a/debian/changelog b/debian/changelog
index e98b622..6dbf50a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ quesoglc (0.7.1-2) unstable; urgency=low
* Add Games Team to Uploaders.
* Update Vcs entries in debian/control.
* Update Standards-Version to 3.8.0. (No Changes).
+ * Add quilt patch system:
+ - 00_fix_as-needed.diff - Fix ltmain.sh --as-needed issue.
-- Bradley Smith <brad at brad-smith.co.uk> Fri, 04 Jul 2008 23:00:40 +0100
diff --git a/debian/control b/debian/control
index 1af95cb..ab846b2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: optional
Maintainer: Bradley Smith <brad at brad-smith.co.uk>
Uploaders: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Homepage: http://quesoglc.sourceforge.net/
-Build-Depends: cdbs,
- debhelper (>= 5),
+Build-Depends: debhelper (>= 5),
autotools-dev,
libfreetype6-dev,
libfribidi-dev,
libfontconfig1-dev,
libgl1-mesa-dev | libgl-dev,
- libglu1-mesa-dev | libglu-dev
+ libglu1-mesa-dev | libglu-dev,
+ quilt
Standards-Version: 3.8.0
Vcs-Git: git://git.debian.org/git/pkg-games/quesoglc.git
diff --git a/debian/patches/00_fix_as-needed.diff b/debian/patches/00_fix_as-needed.diff
new file mode 100644
index 0000000..e1fde05
--- /dev/null
+++ b/debian/patches/00_fix_as-needed.diff
@@ -0,0 +1,30 @@
+--- a/build/ltmain.sh.orig 2006-03-29 15:45:36.000000000 +0200
++++ b/build/ltmain.sh 2006-03-29 16:39:30.000000000 +0200
+@@ -1794,6 +1794,11 @@
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ ;;
+
++ -Wl,--as-needed)
++ deplibs="$deplibs $arg"
++ continue
++ ;;
++
+ -Wl,*)
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ arg=
+@@ -2137,6 +2142,15 @@
+ lib=
+ found=no
+ case $deplib in
++ -Wl,--as-needed)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ fi
++ continue
++ ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..88e30d5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+00_fix_as-needed.diff
diff --git a/debian/rules b/debian/rules
index 5cb7e0d..f3cbf37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
+
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -12,7 +14,7 @@ else
CFLAGS += -O2
endif
-configure: configure-stamp
+configure: patch configure-stamp
configure-stamp:
dh_testdir
LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
@@ -25,7 +27,7 @@ build-stamp: configure
$(MAKE)
touch "$@"
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
--
Packaging for quesoglc
More information about the Pkg-games-commits
mailing list