r299 - in /packages/gnash/trunk/debian: changelog control rules shlibs-agg.local shlibs-opengl.local shlibs.local
miriam at users.alioth.debian.org
miriam at users.alioth.debian.org
Sat Oct 25 14:20:54 UTC 2008
Author: miriam
Date: Sat Oct 25 14:20:53 2008
New Revision: 299
URL: http://svn.debian.org/wsvn/?sc=1&rev=299
Log:
Fixed building and lintian warnings
Added:
packages/gnash/trunk/debian/shlibs-agg.local (props changed)
- copied unchanged from r294, packages/gnash/trunk/debian/shlibs.local
packages/gnash/trunk/debian/shlibs-opengl.local (contents, props changed)
- copied, changed from r294, packages/gnash/trunk/debian/shlibs.local
Removed:
packages/gnash/trunk/debian/shlibs.local
Modified:
packages/gnash/trunk/debian/changelog
packages/gnash/trunk/debian/control
packages/gnash/trunk/debian/rules
Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/changelog?rev=299&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Sat Oct 25 14:20:53 2008
@@ -21,6 +21,8 @@
* Added patch release_version.patch to set release version in all
shared objects
* Using sng to add png images
+ * Replaced gstreamer0.10-plugins-good by gstreamer0.10-plugins-ugly
+ in recommends
-- Miriam Ruiz <little_miry at yahoo.es> Sat, 25 Oct 2008 03:34:30 +0200
Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/control?rev=299&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Sat Oct 25 14:20:53 2008
@@ -20,7 +20,7 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, base-files (>= 4.0.1~),
- gstreamer0.10-plugins-base, gstreamer0.10-videosink | gstreamer0.10-plugins-good,
+ gstreamer0.10-plugins-base, gstreamer0.10-videosink | gstreamer0.10-plugins-ugly,
gstreamer0.10-audiosink | gstreamer0.10-alsa
Recommends: gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg, gstreamer0.10-gnomevfs
Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~), gnash-common-opengl
@@ -36,7 +36,7 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, base-files (>= 4.0.1~),
- gstreamer0.10-plugins-base, gstreamer0.10-videosink | gstreamer0.10-plugins-good,
+ gstreamer0.10-plugins-base, gstreamer0.10-videosink | gstreamer0.10-plugins-ugly,
gstreamer0.10-audiosink | gstreamer0.10-alsa
Recommends: gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg, gstreamer0.10-gnomevfs
Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~), gnash-common
Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/rules?rev=299&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Sat Oct 25 14:20:53 2008
@@ -39,7 +39,7 @@
# CONFIGURE
-CONFIGURE_FLAGS = VERSION="$(BUILD_VERSION)" CFLAGS="$(CFLAGS)" \
+CONFIGURE_FLAGS = CFLAGS="$(CFLAGS)" \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
@@ -76,14 +76,14 @@
@printf "\n == CONFIGURE / AGG ============================================= \n\n"
# In the future, I want to add LDFLAGS="-Wl,-z,defs"
if ! test -d tmp.agg; then \
- mkdir tmp.agg && cd tmp.agg && ../configure $(CONFIGURE_FLAGS) --enable-gstreamer --enable-media=gst --enable-renderer=agg ; \
+ mkdir tmp.agg && cd tmp.agg && ../configure VERSION="$(BUILD_VERSION)" $(CONFIGURE_FLAGS) --enable-gstreamer --enable-media=gst --enable-renderer=agg ; \
fi
@printf "\n ------------------------------------------- End of CONFIGURE ---- \n\n"
@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 $(CONFIGURE_FLAGS) --enable-gstreamer --enable-media=gst --enable-renderer=opengl ; \
+ mkdir tmp.opengl && cd tmp.opengl && ../configure VERSION="opengl.$(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="$(BUILD_VERSION)"
+ $(MAKE) -C tmp.opengl VERSION="opengl.$(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="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp.opengl
+ $(MAKE) -C tmp.opengl install VERSION="opengl.$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp.opengl
@printf "\n -------------------------------------------- End of INSTALL ---- \n\n"
install -d $(CURDIR)/debian/tmp/usr/share/apps/klash
@@ -230,8 +230,22 @@
#dh_makeshlibs
test -e /usr/bin/dh_buildinfo && dh_buildinfo
dh_installdeb
+ export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common-opengl/usr/lib/gnash" ; \
+ 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" ; \
+ dh_shlibdeps -Lgnash-common-opengl \
+ -pgnash-opengl -pklash-opengl \
+ -- -Ldebian/shlibs-opengl.local
export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common/usr/lib/gnash" ; \
- dh_shlibdeps -- $(shell dpkg-shlibdeps --help | sed -ne "s/.*\(--ignore-missing-info\).*/\1/p")
+ 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" ; \
+ dh_shlibdeps -Lgnash-common \
+ -pgnash -pklash -pgnash-tools -pgnash-cygnal -pmozilla-plugin-gnash -pkonqueror-plugin-gnash \
+ -- -Ldebian/shlibs-agg.local
dh_gencontrol
dh_md5sums
dh_builddeb
Propchange: packages/gnash/trunk/debian/shlibs-agg.local
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: packages/gnash/trunk/debian/shlibs-opengl.local (from r294, packages/gnash/trunk/debian/shlibs.local)
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/shlibs-opengl.local?rev=299&op=diff
==============================================================================
--- packages/gnash/trunk/debian/shlibs.local (original)
+++ packages/gnash/trunk/debian/shlibs-opengl.local Sat Oct 25 14:20:53 2008
@@ -1,6 +1,6 @@
-libgnashamf 0.8.4 gnash-common (= ${binary:Version})
-libgnashbase 0.8.4 gnash-common (= ${binary:Version})
-libgnashcore 0.8.4 gnash-common (= ${binary:Version})
-libgnashmedia 0.8.4 gnash-common (= ${binary:Version})
-libgnashnet 0.8.4 gnash-common (= ${binary:Version})
-libmozsdk 0.8.4 gnash-common (= ${binary:Version})
+libgnashamf 0.8.4 gnash-common-opengl (= ${binary:Version})
+libgnashbase 0.8.4 gnash-common-opengl (= ${binary:Version})
+libgnashcore 0.8.4 gnash-common-opengl (= ${binary:Version})
+libgnashmedia 0.8.4 gnash-common-opengl (= ${binary:Version})
+libgnashnet 0.8.4 gnash-common-opengl (= ${binary:Version})
+libmozsdk 0.8.4 gnash-common-opengl (= ${binary:Version})
Propchange: packages/gnash/trunk/debian/shlibs-opengl.local
------------------------------------------------------------------------------
svn:mergeinfo =
More information about the pkg-flash-devel
mailing list