r302 - in /packages/gnash/trunk/debian: changelog rules shlibs-both.local

miriam at users.alioth.debian.org miriam at users.alioth.debian.org
Sun Nov 2 07:22:46 UTC 2008


Author: miriam
Date: Sun Nov  2 07:22:45 2008
New Revision: 302

URL: http://svn.debian.org/wsvn/?sc=1&rev=302
Log:
New release:
  * Make AGG and OpenGL versions have the same release numbers, so that
    gnash-tools works again with both gnash-common and gnash-common-opengl
    Closes: #504048
  * Added $LD_LIBRARY_PATH to LD_LIBRARY_PATH redefinition in dpkg-shlibdeps
    to make it properly work with fakeroot.



Added:
    packages/gnash/trunk/debian/shlibs-both.local
Modified:
    packages/gnash/trunk/debian/changelog
    packages/gnash/trunk/debian/rules

Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/changelog?rev=302&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Sun Nov  2 07:22:45 2008
@@ -1,3 +1,13 @@
+gnash (0.8.4-2) unstable; urgency=low
+
+  * Make AGG and OpenGL versions have the same release numbers, so that
+    gnash-tools works again with both gnash-common and gnash-common-opengl
+    Closes: #504048
+  * Added $LD_LIBRARY_PATH to LD_LIBRARY_PATH redefinition in dpkg-shlibdeps
+    to make it properly work with fakeroot.
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Sun, 02 Nov 2008 06:50:32 +0100
+
 gnash (0.8.4-1) unstable; urgency=low
 
   * New Upstream Release.

Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/rules?rev=302&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Sun Nov  2 07:22:45 2008
@@ -83,7 +83,7 @@
 	@printf "\n == CONFIGURE / OPENGL ========================================== \n\n"
 	# In the future, I want to add LDFLAGS="-Wl,-z,defs"
 	if ! test -d tmp.opengl; then \
-		mkdir tmp.opengl && cd tmp.opengl && ../configure VERSION="opengl.$(BUILD_VERSION)" $(CONFIGURE_FLAGS)  --enable-gstreamer --enable-media=gst --enable-renderer=opengl ; \
+		mkdir tmp.opengl && cd tmp.opengl && ../configure VERSION="$(BUILD_VERSION)" $(CONFIGURE_FLAGS)  --enable-gstreamer --enable-media=gst --enable-renderer=opengl ; \
 	fi
 	@printf "\n ------------------------------------------- End of CONFIGURE ---- \n\n"
 
@@ -102,7 +102,7 @@
 	@printf "\n ----------------------------------------------- End of MAKE ---- \n\n"
 
 	@printf "\n == MAKE / OPENGL =============================================== \n\n"
-	$(MAKE) -C tmp.opengl VERSION="opengl.$(BUILD_VERSION)"
+	$(MAKE) -C tmp.opengl VERSION="$(BUILD_VERSION)"
 	@printf "\n ----------------------------------------------- End of MAKE ---- \n\n"
 
 	@printf "\n == CHECK  / AGG ======================================================= \n\n"
@@ -179,7 +179,7 @@
 	@printf "\n -------------------------------------------- End of INSTALL ---- \n\n"
 
 	@printf "\n == INSTALL / OPENGL ============================================ \n\n"
-	$(MAKE) -C tmp.opengl install VERSION="opengl.$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp.opengl
+	$(MAKE) -C tmp.opengl install VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp.opengl
 	@printf "\n -------------------------------------------- End of INSTALL ---- \n\n"
 
 	install -d $(CURDIR)/debian/tmp/usr/share/apps/klash
@@ -230,22 +230,26 @@
 	#dh_makeshlibs
 	test -e /usr/bin/dh_buildinfo && dh_buildinfo
 	dh_installdeb
-	export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common-opengl/usr/lib/gnash" ; \
+	export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common-opengl/usr/lib/gnash:$$LD_LIBRARY_PATH" ; \
 		dh_shlibdeps -Lgnash-common-opengl \
 		-pgnash-common-opengl \
 		-- -Ldebian/shlibs-opengl.local $(shell dpkg-shlibdeps --help | sed -ne "s/.*\(--ignore-missing-info\).*/\1/p")
-	export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common-opengl/usr/lib/gnash" ; \
+	export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common-opengl/usr/lib/gnash:$$LD_LIBRARY_PATH" ; \
 		dh_shlibdeps -Lgnash-common-opengl \
 		-pgnash-opengl -pklash-opengl \
 		-- -Ldebian/shlibs-opengl.local
-	export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common/usr/lib/gnash" ; \
+	export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common/usr/lib/gnash:$$LD_LIBRARY_PATH" ; \
 		dh_shlibdeps -Lgnash-common \
 		-pgnash-common \
 		-- -Ldebian/shlibs-agg.local $(shell dpkg-shlibdeps --help | sed -ne "s/.*\(--ignore-missing-info\).*/\1/p")
-	export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common/usr/lib/gnash" ; \
+	export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common/usr/lib/gnash:$$LD_LIBRARY_PATH" ; \
 		dh_shlibdeps -Lgnash-common \
-		-pgnash -pklash -pgnash-tools -pgnash-cygnal -pmozilla-plugin-gnash -pkonqueror-plugin-gnash \
+		-pgnash -pklash \
 		-- -Ldebian/shlibs-agg.local
+	export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common/usr/lib/gnash:$$LD_LIBRARY_PATH" ; \
+		dh_shlibdeps -Lgnash-common \
+		-pmozilla-plugin-gnash -pkonqueror-plugin-gnash -pgnash-tools -pgnash-cygnal \
+		-- -Ldebian/shlibs-both.local
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Added: packages/gnash/trunk/debian/shlibs-both.local
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/shlibs-both.local?rev=302&op=file
==============================================================================
--- packages/gnash/trunk/debian/shlibs-both.local (added)
+++ packages/gnash/trunk/debian/shlibs-both.local Sun Nov  2 07:22:45 2008
@@ -1,0 +1,5 @@
+libgnashamf 0.8.4 gnash-common (= ${binary:Version}) | gnash-common-opengl (= ${binary:Version})
+libgnashbase 0.8.4 gnash-common (= ${binary:Version}) | gnash-common-opengl (= ${binary:Version})
+libgnashcore 0.8.4 gnash-common (= ${binary:Version}) | gnash-common-opengl (= ${binary:Version})
+libgnashmedia 0.8.4 gnash-common (= ${binary:Version}) | gnash-common-opengl (= ${binary:Version})
+libgnashnet 0.8.4 gnash-common (= ${binary:Version}) | gnash-common-opengl (= ${binary:Version})




More information about the pkg-flash-devel mailing list