r402 - in /packages/gnash/trunk/debian: ./ overrides/ po/

miriam at users.alioth.debian.org miriam at users.alioth.debian.org
Fri Aug 6 00:55:59 UTC 2010


Author: miriam
Date: Fri Aug  6 00:55:57 2010
New Revision: 402

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=402
Log:
Removed -opengl packages


Added:
    packages/gnash/trunk/debian/shlibs.local
      - copied unchanged from r401, packages/gnash/trunk/debian/shlibs-agg.local
Removed:
    packages/gnash/trunk/debian/gnash-common-opengl.install
    packages/gnash/trunk/debian/gnash-opengl.dirs
    packages/gnash/trunk/debian/gnash-opengl.install
    packages/gnash/trunk/debian/gnash-opengl.links
    packages/gnash/trunk/debian/klash-opengl.install
    packages/gnash/trunk/debian/klash-opengl.links
    packages/gnash/trunk/debian/overrides/gnash-common-opengl
    packages/gnash/trunk/debian/overrides/gnash-opengl
    packages/gnash/trunk/debian/overrides/klash-opengl
    packages/gnash/trunk/debian/shlibs-agg.local
    packages/gnash/trunk/debian/shlibs-opengl.local
Modified:
    packages/gnash/trunk/debian/changelog
    packages/gnash/trunk/debian/control
    packages/gnash/trunk/debian/po/ca.po
    packages/gnash/trunk/debian/po/cs.po
    packages/gnash/trunk/debian/po/es.po
    packages/gnash/trunk/debian/po/fi.po
    packages/gnash/trunk/debian/po/it.po
    packages/gnash/trunk/debian/po/pl.po
    packages/gnash/trunk/debian/po/ru.po
    packages/gnash/trunk/debian/po/sv.po
    packages/gnash/trunk/debian/po/zh_CN.po
    packages/gnash/trunk/debian/rules

Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/changelog?rev=402&op=diff
==============================================================================
--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Fri Aug  6 00:55:57 2010
@@ -2,6 +2,7 @@
 
   * New Upstream Release. Downloaded from Bazaar.
   * Added --enable-hwaccel=none to ./configure
+  * Removed the -opengl packages
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Thu, 05 Aug 2010 18:21:14 +0200
 

Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/control?rev=402&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Fri Aug  6 00:55:57 2010
@@ -21,7 +21,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: gstreamer-plugins-base | libgstreamer-plugins-base0.10-0, gstreamer0.10-plugins-bad, gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
-Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~), gnash-common-opengl
+Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~), gnash-common-opengl (<< 0.8.8~)
 Replaces: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~)
 Description: free Shockwave Flash (SWF) movie player - common files/libraries
  Gnash is a free GPL'd SWF movie player, which works either standalone, or as
@@ -33,23 +33,18 @@
 Package: gnash-common-opengl
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: gstreamer-plugins-base | libgstreamer-plugins-base0.10-0, gstreamer0.10-plugins-bad, gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
-Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~), gnash-common
-Replaces: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~)
+Depends: gnash-common (= ${binary:Version}), ${misc:Depends}
 Description: free Shockwave Flash (SWF) movie player - common files/libraries
  Gnash is a free GPL'd SWF movie player, which works either standalone, or as
  browser plugin for Firefox, Mozilla, and Konqueror.
  .
- This package includes the common files/libraries that use OpenGL
- as the rendering backend.
+ This is a transitional package to guarantee backwards compatibility
 
 Package: gnash
 Section: utils
 Architecture: any
-Depends: gnash-common (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-Conflicts: gnash-opengl
+Depends: gnash-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: gnash-opengl (<< 0.8.8~)
 Description: free Shockwave Flash (SWF) movie player
  Gnash is a free GPL'd SWF movie player, which works either standalone, or as
  browser plugin for Firefox, Mozilla, and Konqueror.
@@ -69,30 +64,18 @@
 Package: gnash-opengl
 Section: utils
 Architecture: any
-Depends: gnash-common-opengl (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-Conflicts: gnash
+Depends: gnash (= ${binary:Version}), ${misc:Depends}
 Description: free Shockwave Flash (SWF) movie player
  Gnash is a free GPL'd SWF movie player, which works either standalone, or as
  browser plugin for Firefox, Mozilla, and Konqueror.
  .
- Gnash supports the majority of Flash opcodes up to SWF version 7, and
- a wide sampling of ActionScript 2 classes for SWF version 8.5. SWF
- version 9 and ActionScript 3 support is being worked on. 
- .
- Included in the Gnash is an XML based messaging system, as specified in
- the SWF specification. This lets a SWF movie communicate over a TCP/IP
- socket, and parse the incoming XML message. This lets a movie be a remote
- control for other devices or applications.
- .
- This package includes the standalone GTK+-based player that use OpenGL
- as the rendering backend.
+ This is a transitional package to guarantee backwards compatibility
 
 Package: klash
 Section: utils
 Architecture: any
 Depends: gnash-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: klash-opengl
+Conflicts: klash-opengl (<< 0.8.8~)
 Description: free Shockwave Flash (SWF) movie player - standalone player for KDE
  Gnash is a free GPL'd SWF movie player, which works either standalone, or as
  browser plugin for Firefox, Mozilla, and Konqueror.
@@ -113,30 +96,17 @@
 Package: klash-opengl
 Section: utils
 Architecture: any
-Depends: gnash-common-opengl (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: klash
+Depends: klash (= ${binary:Version}), ${misc:Depends}
 Description: free Shockwave Flash (SWF) movie player - standalone player for KDE
  Gnash is a free GPL'd SWF movie player, which works either standalone, or as
  browser plugin for Firefox, Mozilla, and Konqueror.
  .
- Gnash supports the majority of Flash opcodes up to SWF version 7, and
- a wide sampling of ActionScript classes for SWF version 8.5. All the
- core ones are implemented, and many of the newer ones work, but may be
- missing some of their methods.
- .
- Included in the Gnash is an XML based messaging system, as specified in
- the SWF specification. This lets a SWF movie communicate over a TCP/IP
- socket, and parse the incoming XML message. This lets a movie be a remote
- control for other devices or applications.
- .
- Klash is the free standalone SWF movie player for KDE that use OpenGL
- as the rendering backend.
+ This is a transitional package to guarantee backwards compatibility
 
 Package: gnash-tools
 Section: utils
 Architecture: any
-Depends: gnash-common (= ${binary:Version}) | gnash-common-opengl (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
+Depends: gnash-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: free Shockwave Flash (SWF) movie player - Command-line Tools
  Gnash is a free GPL'd SWF movie player, which works either standalone, or as
  browser plugin for Firefox, Mozilla, and Konqueror.
@@ -146,8 +116,7 @@
 Package: gnash-cygnal
 Section: utils
 Architecture: any
-Depends: gnash-common (= ${binary:Version}) | gnash-common-opengl (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
+Depends: gnash-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: free Shockwave Flash (SWF) movie player - Media server
  Gnash is a free GPL'd SWF movie player, which works either standalone, or as
  browser plugin for Firefox, Mozilla, and Konqueror.
@@ -157,8 +126,7 @@
 Package: mozilla-plugin-gnash
 Section: utils
 Architecture: any
-Depends: gnash (= ${binary:Version}) | gnash-opengl (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
+Depends: gnash (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384,92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a,aa5ca914-c309-495d-91cf-3141bbb04115
 Xb-Npp-MimeType: application/x-shockwave-flash
 Xb-Npp-Name: Gnash SWF Player
@@ -173,8 +141,7 @@
 Package: konqueror-plugin-gnash
 Section: utils
 Architecture: any
-Depends: klash (= ${binary:Version}) | klash-opengl (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
+Depends: klash (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: free Shockwave Flash (SWF) movie player - Plugin for Konqueror
  Gnash is a free GPL'd SWF movie player, which works either standalone, or as
  browser plugin for Firefox, Mozilla, and Konqueror.

Modified: packages/gnash/trunk/debian/po/ca.po
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/po/ca.po?rev=402&op=diff
==============================================================================
--- packages/gnash/trunk/debian/po/ca.po (original)
+++ packages/gnash/trunk/debian/po/ca.po Fri Aug  6 00:55:57 2010
@@ -6,10 +6,11 @@
 msgstr ""
 "Project-Id-Version: Gnash 0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-05 21:22+0200\n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Robert Millan <rmh.debian at aybabtu.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: packages/gnash/trunk/debian/po/cs.po
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/po/cs.po?rev=402&op=diff
==============================================================================
--- packages/gnash/trunk/debian/po/cs.po (original)
+++ packages/gnash/trunk/debian/po/cs.po Fri Aug  6 00:55:57 2010
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: gnash\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-05 21:22+0200\n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
 "PO-Revision-Date: 2009-11-17 21:04+0100\n"
 "Last-Translator: Michal Simunek <michal.simunek at gmail.com>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: packages/gnash/trunk/debian/po/es.po
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/po/es.po?rev=402&op=diff
==============================================================================
--- packages/gnash/trunk/debian/po/es.po (original)
+++ packages/gnash/trunk/debian/po/es.po Fri Aug  6 00:55:57 2010
@@ -6,10 +6,11 @@
 msgstr ""
 "Project-Id-Version: Gnash 0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-05 21:22+0200\n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Robert Millan <rmh.debian at aybabtu.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: packages/gnash/trunk/debian/po/fi.po
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/po/fi.po?rev=402&op=diff
==============================================================================
--- packages/gnash/trunk/debian/po/fi.po (original)
+++ packages/gnash/trunk/debian/po/fi.po Fri Aug  6 00:55:57 2010
@@ -6,10 +6,11 @@
 msgstr ""
 "Project-Id-Version: gnash\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-05 21:22+0200\n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
 "PO-Revision-Date: 2009-11-17 23:02+0200\n"
 "Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: packages/gnash/trunk/debian/po/it.po
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/po/it.po?rev=402&op=diff
==============================================================================
--- packages/gnash/trunk/debian/po/it.po (original)
+++ packages/gnash/trunk/debian/po/it.po Fri Aug  6 00:55:57 2010
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: gnash\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-05 21:22+0200\n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
 "PO-Revision-Date: 2009-11-16 17:44ora so\n"
 "Last-Translator: Vincenzo Campanella <vinz65 at gmail.com>\n"
 "Language-Team: it <mailto:tp at lists.linux.it>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: packages/gnash/trunk/debian/po/pl.po
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/po/pl.po?rev=402&op=diff
==============================================================================
--- packages/gnash/trunk/debian/po/pl.po (original)
+++ packages/gnash/trunk/debian/po/pl.po Fri Aug  6 00:55:57 2010
@@ -8,10 +8,11 @@
 msgstr ""
 "Project-Id-Version: Gnash\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-05 21:22+0200\n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
 "PO-Revision-Date: 2009-11-17 05:05+0100\n"
 "Last-Translator: Wiktor Wandachowicz <siryes at gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish at lists.debian.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: packages/gnash/trunk/debian/po/ru.po
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/po/ru.po?rev=402&op=diff
==============================================================================
--- packages/gnash/trunk/debian/po/ru.po (original)
+++ packages/gnash/trunk/debian/po/ru.po Fri Aug  6 00:55:57 2010
@@ -7,16 +7,17 @@
 msgstr ""
 "Project-Id-Version: gnash desktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-05 21:22+0200\n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
 "PO-Revision-Date: 2009-11-16 20:15+0300\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../../debian/gnash.desktop.in.h:1
 msgid "Gnash SWF Viewer"

Modified: packages/gnash/trunk/debian/po/sv.po
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/po/sv.po?rev=402&op=diff
==============================================================================
--- packages/gnash/trunk/debian/po/sv.po (original)
+++ packages/gnash/trunk/debian/po/sv.po Fri Aug  6 00:55:57 2010
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-05 21:22+0200\n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
 "PO-Revision-Date: 2009-11-16 23:12+0100\n"
 "Last-Translator: Martin Bagge <brother at bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: packages/gnash/trunk/debian/po/zh_CN.po
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/po/zh_CN.po?rev=402&op=diff
==============================================================================
--- packages/gnash/trunk/debian/po/zh_CN.po (original)
+++ packages/gnash/trunk/debian/po/zh_CN.po Fri Aug  6 00:55:57 2010
@@ -8,10 +8,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-05 21:22+0200\n"
+"POT-Creation-Date: 2010-08-06 00:12+0000\n"
 "PO-Revision-Date: 2009-11-16 22:17+0800\n"
 "Last-Translator: 苏运强 <wzssyqa at gmail.com>\n"
 "Language-Team: Chinese (simplified)\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/trunk/debian/rules?rev=402&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Fri Aug  6 00:55:57 2010
@@ -71,6 +71,7 @@
 		--enable-hwaccel=none \
 		--enable-media=gst \
 		--enable-gui='gtk,kde4' \
+		--enable-renderer=all \
 		--enable-plugin \
 		--enable-docbook \
 		--with-npapi-plugindir=\$${prefix}/lib/gnash \
@@ -78,7 +79,7 @@
 		--with-plugins-install=system \
 		--enable-shared=yes \
 		--enable-lotsa-warnings \
-		--without-gcc-arch\
+		--without-gcc-arch \
 		--without-included-ltdl
 
 config: config-stamp
@@ -96,18 +97,11 @@
 	if test -e autogen.sh; then ./autogen.sh; else sh debian/autogen.sh; fi
 	printf "\n -------------------------------------------- End of AUTOGEN ---- \n\n"
 
-	printf "\n == CONFIGURE / AGG ============================================= \n\n"
+	printf "\n == CONFIGURE =================================================== \n\n"
 	# In the future, I want to add LDFLAGS="-Wl,-z,defs"
-	if ! test -d tmp.agg; then printf "\ntmp.agg already exists!!!\n\n"; fi
-	mkdir -p tmp.agg
-	cd tmp.agg && ../configure VERSION="$(BUILD_VERSION)" $(CONFIGURE_FLAGS) --enable-renderer=agg ; \
-	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 printf "\ntmp.opengl already exists!!!\n\n"; fi
-	mkdir -p tmp.opengl
-	cd tmp.opengl && ../configure VERSION="$(BUILD_VERSION)" $(CONFIGURE_FLAGS) --enable-renderer=ogl ; \
+	if ! test -d tmp.build; then printf "\ntmp.build already exists!!!\n\n"; fi
+	mkdir -p tmp.build
+	cd tmp.build && ../configure VERSION="$(BUILD_VERSION)" $(CONFIGURE_FLAGS); \
 	printf "\n ------------------------------------------- End of CONFIGURE ---- \n\n"
 
 	touch $@
@@ -118,20 +112,12 @@
 build-stamp: config-stamp $(OUTFILES)
 	dh_testdir
 
-	printf "\n == MAKE / AGG ================================================== \n\n"
-	$(MAKE) -C tmp.agg VERSION="$(BUILD_VERSION)"
+	printf "\n == MAKE ======================================================== \n\n"
+	$(MAKE) -C tmp.build VERSION="$(BUILD_VERSION)"
 	printf "\n ----------------------------------------------- End of MAKE ---- \n\n"
 
-	printf "\n == MAKE / OPENGL =============================================== \n\n"
-	$(MAKE) -C tmp.opengl VERSION="$(BUILD_VERSION)"
-	printf "\n ----------------------------------------------- End of MAKE ---- \n\n"
-
-	printf "\n == CHECK  / AGG ======================================================= \n\n"
-	$(MAKE) -C tmp.agg check
-	printf "\n ---------------------------------------------- End of CHECK ---- \n\n"
-
-	printf "\n == CHECK  / OPENGL ==================================================== \n\n"
-	$(MAKE) -C tmp.opengl check
+	printf "\n == CHECK ======================================================= \n\n"
+	$(MAKE) -C tmp.build check
 	printf "\n ---------------------------------------------- End of CHECK ---- \n\n"
 
 	cd debian && for i in *.sng; do sng "$$i"; done
@@ -175,7 +161,7 @@
 	-rm -f README.amf
 	-rm -f debian/*.png
 
-	rm -rf debian/tmp debian/tmp.opengl tmp.agg tmp.opengl
+	rm -rf debian/tmp debian/tmp.opengl tmp.build
 
 	printf "\n == CLEANING PATCHES ============================================ \n\n"
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
@@ -196,27 +182,19 @@
 	install -d $(CURDIR)/debian/tmp/usr/lib/gnash/
 
 	printf "\n == INSTALL ===================================================== \n\n"
-	$(MAKE) -C tmp.agg install VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp
-	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.build install VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp
 	printf "\n -------------------------------------------- End of INSTALL ---- \n\n"
 
 	install -d $(CURDIR)/debian/tmp/usr/share/apps/klash
 	install -d $(CURDIR)/debian/tmp/usr/share/services
 
 	printf "\n == INSTALL PLUGINS ============================================= \n\n"
-	$(MAKE) -C tmp.agg install-plugins VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) -C tmp.build install-plugins VERSION="$(BUILD_VERSION)" DESTDIR=$(CURDIR)/debian/tmp
 	printf "\n ------------------------------------ End of INSTALL PLUGINS ---- \n\n"
 
 	printf "\n == LIST OF FILES =============================================== \n\n"
 	cd $(CURDIR)/debian/tmp && find
 	printf "\n -------------------------------------- End of LIST OF FILES ---- \n\n"
-
-	printf "\n == LIST OF FILES / OPENGL ====================================== \n\n"
-	cd $(CURDIR)/debian/tmp.opengl && find
-	printf "\n ----------------------------- End of LIST OF FILES / OPENGL ---- \n\n"
 
 # CREATE PACKAGES
 
@@ -248,26 +226,18 @@
 	dh_makeshlibs
 	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo
 	dh_installdeb
-	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:$$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:$$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")
+		-- -Ldebian/shlibs.local $(shell dpkg-shlibdeps --help | sed -ne "s/.*\(--ignore-missing-info\).*/\1/p")
 	export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common/usr/lib/gnash:$$LD_LIBRARY_PATH" ; \
 		dh_shlibdeps -Lgnash-common \
 		-pgnash -pklash \
-		-- -Ldebian/shlibs-agg.local
+		-- -Ldebian/shlibs.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
+		-- -Ldebian/shlibs.local
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb




More information about the pkg-flash-devel mailing list