[Pkg-cli-libs-commits] [taoframework] 01/02: Fix Tao .pc files (Closes: #808631)
Jo Shields
directhex at moszumanska.debian.org
Mon Dec 21 20:50:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
directhex pushed a commit to annotated tag debian/2.1.svn20090801-14
in repository taoframework.
commit f8aeb70764b8a4bd06796587aec0f22b0f8aae72
Author: Jo Shields <directhex at apebox.org>
Date: Mon Dec 21 20:45:05 2015 +0000
Fix Tao .pc files (Closes: #808631)
---
debian/patches/400_cli_policy_0.7_pcfiles.diff | 59 ++++++++++++++---------
debian/patches/500_dont_rename_pcfiles.diff | 67 +++++++++++++++++---------
2 files changed, 78 insertions(+), 48 deletions(-)
diff --git a/debian/patches/400_cli_policy_0.7_pcfiles.diff b/debian/patches/400_cli_policy_0.7_pcfiles.diff
index 2365ef8..0d2c8b5 100644
--- a/debian/patches/400_cli_policy_0.7_pcfiles.diff
+++ b/debian/patches/400_cli_policy_0.7_pcfiles.diff
@@ -1,18 +1,18 @@
-Index: taoframework-2.1.svn20090801/src/Tao.OpenAl/tao-openal.pc.in
+Index: taoframework/src/Tao.OpenAl/tao-openal.pc.in
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.OpenAl/tao-openal.pc.in 2010-01-25 10:01:25.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.OpenAl/tao-openal.pc.in 2010-01-25 10:01:34.000000000 +0000
-@@ -5,4 +5,4 @@
+--- taoframework.orig/src/Tao.OpenAl/tao-openal.pc.in
++++ taoframework/src/Tao.OpenAl/tao-openal.pc.in
+@@ -5,4 +5,4 @@ libdir=${exec_prefix}/lib
Name: Tao.OpenAl
Description: OpenAl portion of Tao framework
Version: @TAOOPENAL_VERSION@
-Libs: -r:${libdir}/mono/tao-openal- at TAOOPENAL_MAJOR@/Tao.OpenAl.dll
+Libs: -r:${libdir}/cli/Tao.OpenAl- at TAOOPENAL_MAJOR@/Tao.OpenAl.dll
-Index: taoframework-2.1.svn20090801/src/Tao.OpenGl/tao-opengl.pc.in
+Index: taoframework/src/Tao.OpenGl/tao-opengl.pc.in
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.OpenGl/tao-opengl.pc.in 2010-01-25 10:01:25.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.OpenGl/tao-opengl.pc.in 2010-01-25 10:01:34.000000000 +0000
-@@ -5,6 +5,6 @@
+--- taoframework.orig/src/Tao.OpenGl/tao-opengl.pc.in
++++ taoframework/src/Tao.OpenGl/tao-opengl.pc.in
+@@ -5,6 +5,6 @@ libdir=${exec_prefix}/lib
Name: Tao.OpenGl
Description: OpenGL section of the Tao framework
Version: @TAOOPENGL_VERSION@
@@ -21,47 +21,58 @@ Index: taoframework-2.1.svn20090801/src/Tao.OpenGl/tao-opengl.pc.in
+Requires: tao-platform-x11
+Libs: -r:${libdir}/cli/Tao.OpenGl- at TAOOPENGL_MAJOR@/Tao.OpenGl.dll
-Index: taoframework-2.1.svn20090801/src/Tao.Platform.Windows/tao-platform-windows.pc.in
+Index: taoframework/src/Tao.Platform.Windows/tao-platform-windows.pc.in
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.Platform.Windows/tao-platform-windows.pc.in 2010-01-25 10:01:25.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.Platform.Windows/tao-platform-windows.pc.in 2010-01-25 10:01:34.000000000 +0000
-@@ -6,5 +6,5 @@
+--- taoframework.orig/src/Tao.Platform.Windows/tao-platform-windows.pc.in
++++ taoframework/src/Tao.Platform.Windows/tao-platform-windows.pc.in
+@@ -6,5 +6,5 @@ Name: Tao.Platform.Windows
Description: Windows-specific section of the Tao framework
Version: @TAOWINDOWS_VERSION@
Requires:
-Libs: -r:${libdir}/mono/tao-platform-windows- at TAOWINDOWS_MAJOR@/Tao.Platform.Windows.dll
+Libs: -r:${libdir}/cli/Tao.Platform.Windows- at TAOWINDOWS_MAJOR@/Tao.Platform.Windows.dll
-Index: taoframework-2.1.svn20090801/src/Tao.Platform.X11/tao-platform-x11.pc.in
+Index: taoframework/src/Tao.Platform.X11/tao-platform-x11.pc.in
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.Platform.X11/tao-platform-x11.pc.in 2010-01-25 10:01:25.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.Platform.X11/tao-platform-x11.pc.in 2010-01-25 10:01:34.000000000 +0000
-@@ -6,5 +6,5 @@
+--- taoframework.orig/src/Tao.Platform.X11/tao-platform-x11.pc.in
++++ taoframework/src/Tao.Platform.X11/tao-platform-x11.pc.in
+@@ -6,5 +6,5 @@ Name: Tao.Platform.X11
Description: X11-specific section of the Tao framework
Version: @TAOX11_VERSION@
Requires:
-Libs: -r:${libdir}/mono/tao-platform-x11- at TAOX11_MAJOR@/Tao.Platform.X11.dll
+Libs: -r:${libdir}/cli/Tao.Platform.X11- at TAOX11_MAJOR@/Tao.Platform.X11.dll
-Index: taoframework-2.1.svn20090801/src/Tao.Sdl/tao-sdl.pc.in
+Index: taoframework/src/Tao.Sdl/tao-sdl.pc.in
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.Sdl/tao-sdl.pc.in 2010-01-25 10:01:25.000000000 +0000
-+++ taoframework-2.1.svn20090801/src/Tao.Sdl/tao-sdl.pc.in 2010-01-25 10:01:34.000000000 +0000
-@@ -6,5 +6,5 @@
+--- taoframework.orig/src/Tao.Sdl/tao-sdl.pc.in
++++ taoframework/src/Tao.Sdl/tao-sdl.pc.in
+@@ -6,5 +6,5 @@ Name: Tao.Sdl
Description: SDL portion of the Tao framework
Version: @TAOSDL_VERSION@
Requires:
-Libs: -r:${libdir}/mono/tao-sdl- at TAOSDL_MAJOR@/Tao.Sdl.dll
+Libs: -r:${libdir}/cli/Tao.Sdl- at TAOSDL_MAJOR@/Tao.Sdl.dll
-Index: taoframework-2.1.svn20090801/tests/Sdl/tao-sdl-tests.pc.in
+Index: taoframework/tests/Sdl/tao-sdl-tests.pc.in
===================================================================
---- taoframework-2.1.svn20090801.orig/tests/Sdl/tao-sdl-tests.pc.in 2010-01-25 10:01:25.000000000 +0000
-+++ taoframework-2.1.svn20090801/tests/Sdl/tao-sdl-tests.pc.in 2010-01-25 10:02:08.000000000 +0000
-@@ -6,5 +6,5 @@
+--- taoframework.orig/tests/Sdl/tao-sdl-tests.pc.in
++++ taoframework/tests/Sdl/tao-sdl-tests.pc.in
+@@ -6,5 +6,5 @@ Name: Tao.Sdl.Tests
Description: Unit tests for the SDL portion of the Tao framework
Version: @TAOSDL_VERSION@
Requires:
-Libs: -r:${libdir}/mono/tao-sdl-tests- at TAOSDL_MAJOR@/Tao.Sdl.Tests.dll
+Libs: -r:${libdir}/cli/Tao.Sdl.Tests-1.0/Tao.Sdl.Tests.dll
+Index: taoframework/src/Tao.FreeGlut/tao-freeglut.pc.in
+===================================================================
+--- taoframework.orig/src/Tao.FreeGlut/tao-freeglut.pc.in
++++ taoframework/src/Tao.FreeGlut/tao-freeglut.pc.in
+@@ -6,4 +6,5 @@ Name: Tao.FreeGlut
+ Description: FreeGlut portion of the Tao framework
+ Version: @TAOFREEGLUT_VERSION@
+ Requires: tao-opengl- at TAOOPENGL_MAJOR@
+-Libs: -r:${libdir}/mono/tao-freeglut- at TAOFREEGLUT_MAJOR@/Tao.FreeGlut.dll
++Libs: -r:${libdir}/cli/Tao.FreeGlut- at TAOFREEGLUT_MAJOR@/Tao.FreeGlut.dll
++
diff --git a/debian/patches/500_dont_rename_pcfiles.diff b/debian/patches/500_dont_rename_pcfiles.diff
index a55c9fe..6068721 100644
--- a/debian/patches/500_dont_rename_pcfiles.diff
+++ b/debian/patches/500_dont_rename_pcfiles.diff
@@ -1,8 +1,8 @@
-Index: taoframework-2.1.svn20090801/src/Tao.OpenAl/Makefile.in
+Index: taoframework/src/Tao.OpenAl/Makefile.in
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.OpenAl/Makefile.in 2009-08-01 10:28:50.000000000 +0100
-+++ taoframework-2.1.svn20090801/src/Tao.OpenAl/Makefile.in 2010-01-25 09:21:39.000000000 +0000
-@@ -403,14 +403,11 @@
+--- taoframework.orig/src/Tao.OpenAl/Makefile.in
++++ taoframework/src/Tao.OpenAl/Makefile.in
+@@ -403,14 +403,11 @@ install-data-local: $(ASSEMBLY).dll
-f -root $(DESTDIR)$(libdir)
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
$(INSTALL) -m 644 $(SHORTNAME).pc \
@@ -17,11 +17,11 @@ Index: taoframework-2.1.svn20090801/src/Tao.OpenAl/Makefile.in
rm -f $(DESTDIR)$(pkgconfigdir)/$(SHORTNAME).pc
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-Index: taoframework-2.1.svn20090801/src/Tao.OpenGl/Makefile.in
+Index: taoframework/src/Tao.OpenGl/Makefile.in
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.OpenGl/Makefile.in 2009-08-01 10:28:50.000000000 +0100
-+++ taoframework-2.1.svn20090801/src/Tao.OpenGl/Makefile.in 2010-01-25 09:21:39.000000000 +0000
-@@ -406,14 +406,11 @@
+--- taoframework.orig/src/Tao.OpenGl/Makefile.in
++++ taoframework/src/Tao.OpenGl/Makefile.in
+@@ -406,14 +406,11 @@ install-data-local: $(ASSEMBLY).dll
-f -root $(DESTDIR)$(libdir)
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
$(INSTALL) -m 644 $(SHORTNAME).pc \
@@ -36,11 +36,11 @@ Index: taoframework-2.1.svn20090801/src/Tao.OpenGl/Makefile.in
rm -f $(DESTDIR)$(pkgconfigdir)/$(SHORTNAME).pc
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-Index: taoframework-2.1.svn20090801/src/Tao.Platform.Windows/Makefile.in
+Index: taoframework/src/Tao.Platform.Windows/Makefile.in
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.Platform.Windows/Makefile.in 2009-08-01 10:28:50.000000000 +0100
-+++ taoframework-2.1.svn20090801/src/Tao.Platform.Windows/Makefile.in 2010-01-25 09:21:39.000000000 +0000
-@@ -415,14 +415,11 @@
+--- taoframework.orig/src/Tao.Platform.Windows/Makefile.in
++++ taoframework/src/Tao.Platform.Windows/Makefile.in
+@@ -415,14 +415,11 @@ install-data-local: $(ASSEMBLY).dll
-f -root $(DESTDIR)$(libdir)
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
$(INSTALL) -m 644 $(SHORTNAME).pc \
@@ -55,11 +55,11 @@ Index: taoframework-2.1.svn20090801/src/Tao.Platform.Windows/Makefile.in
rm -f $(DESTDIR)$(pkgconfigdir)/$(SHORTNAME).pc
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-Index: taoframework-2.1.svn20090801/src/Tao.Platform.X11/Makefile.in
+Index: taoframework/src/Tao.Platform.X11/Makefile.in
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.Platform.X11/Makefile.in 2009-08-01 10:28:50.000000000 +0100
-+++ taoframework-2.1.svn20090801/src/Tao.Platform.X11/Makefile.in 2010-01-25 09:21:39.000000000 +0000
-@@ -407,14 +407,11 @@
+--- taoframework.orig/src/Tao.Platform.X11/Makefile.in
++++ taoframework/src/Tao.Platform.X11/Makefile.in
+@@ -407,14 +407,11 @@ install-data-local: $(ASSEMBLY).dll
-f -root $(DESTDIR)$(libdir)
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
$(INSTALL) -m 644 $(SHORTNAME).pc \
@@ -74,11 +74,11 @@ Index: taoframework-2.1.svn20090801/src/Tao.Platform.X11/Makefile.in
rm -f $(DESTDIR)$(pkgconfigdir)/$(SHORTNAME).pc
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-Index: taoframework-2.1.svn20090801/src/Tao.Sdl/Makefile.in
+Index: taoframework/src/Tao.Sdl/Makefile.in
===================================================================
---- taoframework-2.1.svn20090801.orig/src/Tao.Sdl/Makefile.in 2009-08-01 10:28:50.000000000 +0100
-+++ taoframework-2.1.svn20090801/src/Tao.Sdl/Makefile.in 2010-01-25 09:21:39.000000000 +0000
-@@ -406,14 +406,11 @@
+--- taoframework.orig/src/Tao.Sdl/Makefile.in
++++ taoframework/src/Tao.Sdl/Makefile.in
+@@ -406,14 +406,11 @@ install-data-local: $(ASSEMBLY).dll
-f -root $(DESTDIR)$(libdir)
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
$(INSTALL) -m 644 $(SHORTNAME).pc \
@@ -93,11 +93,30 @@ Index: taoframework-2.1.svn20090801/src/Tao.Sdl/Makefile.in
rm -f $(DESTDIR)$(pkgconfigdir)/$(SHORTNAME).pc
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-Index: taoframework-2.1.svn20090801/tests/Sdl/Makefile.in
+Index: taoframework/tests/Sdl/Makefile.in
===================================================================
---- taoframework-2.1.svn20090801.orig/tests/Sdl/Makefile.in 2010-01-25 09:22:36.000000000 +0000
-+++ taoframework-2.1.svn20090801/tests/Sdl/Makefile.in 2010-01-25 09:22:44.000000000 +0000
-@@ -406,14 +406,11 @@
+--- taoframework.orig/tests/Sdl/Makefile.in
++++ taoframework/tests/Sdl/Makefile.in
+@@ -406,14 +406,11 @@ install-data-local: $(ASSEMBLY).dll
+ -f -root $(DESTDIR)$(libdir)
+ $(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
+ $(INSTALL) -m 644 $(SHORTNAME).pc \
+- $(DESTDIR)$(pkgconfigdir)/$(SHORTNAME)-$(MAJOR).pc
+- ln -sf $(SHORTNAME)-$(MAJOR).pc \
+ $(DESTDIR)$(pkgconfigdir)/$(SHORTNAME).pc
+
+ uninstall-local:
+ $(GACUTIL) -u $(ASSEMBLY), Version=$(VERSION) \
+ -package $(SHORTNAME)-$(MAJOR) || true
+- rm -f $(DESTDIR)$(pkgconfigdir)/$(SHORTNAME)-$(MAJOR).pc
+ rm -f $(DESTDIR)$(pkgconfigdir)/$(SHORTNAME).pc
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: taoframework/src/Tao.FreeGlut/Makefile.in
+===================================================================
+--- taoframework.orig/src/Tao.FreeGlut/Makefile.in
++++ taoframework/src/Tao.FreeGlut/Makefile.in
+@@ -400,14 +400,11 @@ install-data-local: $(ASSEMBLY).dll
-f -root $(DESTDIR)$(libdir)
$(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
$(INSTALL) -m 644 $(SHORTNAME).pc \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/taoframework.git
More information about the Pkg-cli-libs-commits
mailing list