r439 - in /packages/gnash/trunk/debian: changelog control rules shlibs.local source/format

Sun Aug 29 02:33:31 UTC 2010

Author: gg0-guest
Date: Sun Aug 29 02:33:30 2010
New Revision: 439

URL: http://svn.debian.org/wsvn/?sc=1&rev=439
Log:
3.0quilt, buildinfo only in g-common, dh_shlibdeps/3

Removed:
    packages/gnash/trunk/debian/shlibs.local
Modified:
    packages/gnash/trunk/debian/changelog
    packages/gnash/trunk/debian/control
    packages/gnash/trunk/debian/rules
    packages/gnash/trunk/debian/source/format

Modified: packages/gnash/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/changelog?rev=439&op=diff
==============================================================================

--- packages/gnash/trunk/debian/changelog (original)
+++ packages/gnash/trunk/debian/changelog Sun Aug 29 02:33:30 2010
@@ -11,6 +11,8 @@
     + Added doxygen as Build-Depends.
   * Added swfdec-mozilla and swfdec-gnome dummy packages for swfdec transition.
   * Removed transitional *-opengl packages. Real packages replace them.
+  * Source format to 3.0 (quilt).
+    + Removed quilt from Build-Depends.
 
   [ Miriam Ruiz ]
   * Added support for MIME for ShockWave Flash and FutureSplash Flash
@@ -18,7 +20,10 @@
   * Removed Robert Millan from uploaders
   * Added Gabriele to uploaders
 
- -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sat, 28 Aug 2010 20:00:17 +0200
+  [ Gabriele Giacone ]
+  * 
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sun, 29 Aug 2010 04:30:35 +0200
 
 gnash (0.8.8-1) experimental; urgency=low
 

Modified: packages/gnash/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/control?rev=439&op=diff
==============================================================================
--- packages/gnash/trunk/debian/control (original)
+++ packages/gnash/trunk/debian/control Sun Aug 29 02:33:30 2010
@@ -3,7 +3,7 @@
 Maintainer: Debian Flash Team <pkg-flash-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Alexander Sack <asac at jwsdot.com>,
  Gabriele Giacone <1o5g4r8o at gmail.com> 
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), quilt, sng,
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), sng,
  dh-buildinfo, autoconf, automake, libtool, intltool, docbook, docbook2x,
  libltdl3-dev, libxmu-dev, dejagnu, autotools-dev, doxygen, xsltproc, docbook-xsl,
  libjpeg-dev, libpng12-dev | libpng-dev, libgif-dev, libagg-dev, libpango1.0-dev | pango-dev,

Modified: packages/gnash/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/rules?rev=439&op=diff
==============================================================================
--- packages/gnash/trunk/debian/rules (original)
+++ packages/gnash/trunk/debian/rules Sun Aug 29 02:33:30 2010
@@ -42,14 +42,6 @@
 # awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	printf "\n == APPLYING PATCHES ============================================ \n\n"
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
-	printf "\n ----------------------------------- End of APPLYING PATCHES ---- \n\n"
-	touch $@
 
 # CONFIGURE
 
@@ -87,7 +79,7 @@
 		--without-included-ltdl
 
 config: config-stamp
-config-stamp: patch-stamp
+config-stamp:
 	dh_testdir
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -134,7 +126,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f config-stamp build-stamp patch-stamp
+	rm -f config-stamp build-stamp
 	rm -f $(OUTFILES)
 	ls $(INFILES) | sed 's#^#../#' >debian/po/POTFILES.in
 	cd debian/po && intltool-update -g debian --pot && \
@@ -167,10 +159,6 @@
 
 	rm -rf debian/tmp debian/tmp.opengl tmp.build
 
-	printf "\n == CLEANING PATCHES ============================================ \n\n"
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	printf "\n ----------------------------------- End of CLEANING PATCHES ---- \n\n"
-
 	dh_clean 
 
 # INSTALL
@@ -203,7 +191,7 @@
 # CREATE PACKAGES
 
 # Build architecture-independent files here.
-binary-indep:
+binary-indep: install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -i NEWS
@@ -215,7 +203,6 @@
 	dh_strip -i
 	dh_compress -i
 	dh_fixperms -i
-	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo -i
 	dh_installdeb -i
 	dh_shlibdeps -i
 	dh_gencontrol -i
@@ -250,20 +237,10 @@
 	dh_compress -a
 	dh_fixperms -a
 	dh_makeshlibs -a
-	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo -a
+	dh_shlibdeps -a
+	# dh_buildinfo output only in gnash-common
+	dh_buildinfo -pgnash-common
 	dh_installdeb -a
-	export LD_LIBRARY_PATH="$(CURDIR)/debian/gnash-common/usr/lib/gnash:$$LD_LIBRARY_PATH" ; \
-		dh_shlibdeps -Lgnash-common \
-		-pgnash-common \
-		-- -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.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.local
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
@@ -277,4 +254,4 @@
 	rm -rf $(TMPDIR) && dch -v $(VER)-1 "Git snapshot."
 
 binary: binary-indep binary-arch
-.PHONY: config build clean binary-indep binary-arch binary install get-bzr-source patch
+.PHONY: config build clean binary-indep binary-arch binary install get-bzr-source

Modified: packages/gnash/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/packages/gnash/trunk/debian/source/format?rev=439&op=diff
==============================================================================
--- packages/gnash/trunk/debian/source/format (original)
+++ packages/gnash/trunk/debian/source/format Sun Aug 29 02:33:30 2010
@@ -1,1 +1,1 @@
-1.0
+3.0 (quilt)


