[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11917: apply a modified patch to ma
From: |
Rob Savoye |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11917: apply a modified patch to make our debian packaging files more similar structurally to Debian's to make comparisons easier. Also now build in sub-directory. |
Date: |
Sun, 07 Feb 2010 15:02:19 -0700 |
User-agent: |
Bazaar (2.0.2) |
------------------------------------------------------------
revno: 11917
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sun 2010-02-07 15:02:19 -0700
message:
apply a modified patch to make our debian packaging files more similar
structurally to Debian's to make comparisons easier. Also now build in
sub-directory.
modified:
packaging/debian/control
packaging/debian/docs
packaging/debian/gnash-cygnal.install
packaging/debian/rules
packaging/debian/source.lintian-overrides
=== modified file 'packaging/debian/control'
--- a/packaging/debian/control 2010-02-06 19:27:02 +0000
+++ b/packaging/debian/control 2010-02-07 22:02:19 +0000
@@ -9,7 +9,8 @@
Package: gnash-common
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer-plugins-base |
libgstreamer-plugins-base0.10-0, gstreamer0.10-plugins-bad,
gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ gstreamer-plugins-base | libgstreamer-plugins-base0.10-0,
gstreamer0.10-plugins-bad, gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
Suggests: mozilla-plugin-gnash (= ${binary:Version}), gstreamer0.10-alsa
Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~),
gnash-common-opengl
Description: free SWF movie player - common files/libraries
@@ -61,7 +62,8 @@
Package: gnash-tools
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnash-common (= ${binary:Version})
+Depends: gnash-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
Description: free SWF movie player - Command-line Tools
Gnash is a free Flash movie player, which works either standalone, or as
plugin for Firefox/Mozilla or Konqueror. Currently it is in a beta state.
@@ -82,7 +84,8 @@
Package: gnash-cygnal
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnash-common (= ${binary:Version})
+Depends: gnash-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
Description: free SWF movie player - Media server
Gnash is a free Flash movie player, which works either standalone, or as
plugin for Firefox/Mozilla or Konqueror. Currently it is in a beta state.
@@ -103,7 +106,8 @@
Package: mozilla-plugin-gnash
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnash (= ${binary:Version})
+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
@@ -126,7 +130,8 @@
Package: gtk-plugin-gnash
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnash-common (=
${binary:Version})
+Depends: gnash-common (= ${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
=== modified file 'packaging/debian/docs'
--- a/packaging/debian/docs 2008-03-03 04:34:32 +0000
+++ b/packaging/debian/docs 2010-02-07 22:02:19 +0000
@@ -1,4 +1,5 @@
NEWS
README
README.amf
+README.cygnal
AUTHORS
=== modified file 'packaging/debian/gnash-cygnal.install'
--- a/packaging/debian/gnash-cygnal.install 2010-02-05 17:50:01 +0000
+++ b/packaging/debian/gnash-cygnal.install 2010-02-07 22:02:19 +0000
@@ -1,4 +1,4 @@
-/etc/cygnalrc
+etc/cygnalrc
usr/bin/cygnal
usr/lib/cygnal/plugins/*.so
usr/share/man/man1/cygnal.1
=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules 2010-02-06 19:27:02 +0000
+++ b/packaging/debian/rules 2010-02-07 22:02:19 +0000
@@ -14,8 +14,15 @@
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
MAIN_VERSION = $(shell head -n 1 debian/changelog | cut '-d ' -f 2 | sed
's/[()]//g')
+BUILD_VERSION = $(shell head -n 1 debian/changelog | cut '-d ' -f 2 | sed
's/^[()]//' | sed 's/-.*//')
+
+# this is where all the objects and executables go
+BUILD_DIRECTORY = _build
+
CFLAGS = -Wall -g -Werror-implicit-function-declaration
+# Sometimes we want to build without optimization, usually only when
+# testing package building.
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
CXXFLAGS += -O0
@@ -25,63 +32,68 @@
DEB_DH_SHLIBDEPS_ARGS_ALL := -X* /usr/lib/gnash
-# shared library versions, option 1
-#version=2.0.5
-#major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# 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"
+ printf "we have no patches, we're the developers!"
+# $(MAKE) -f /usr/share/quilt/quilt.make patch
+ printf "\n ---- End of APPLYING PATCHES ---- \n\n"
+ touch $@
# CONFIGURE
-# Configure Gnash. We use a different set of options,as when building
+# Configure Gnash. We use a different set of options, as when building
# packages, we want to enable everything that Gnash can do, like
# python support, the SDK cygnal, etc... These are not enabled by
# default to make it less complicated for end users building Gnash
# from source.
-config.status: configure
+# for now, only build the kde4 support, as kde3 is being depreciated.
+CONFIGURE_FLAGS = CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --disable-testsuite \
+ --disable-rpath \
+ --enable-cygnal \
+ --enable-docbook \
+ --with-plugins-install=system \
+ --disable-dependency-tracking \
+ --enable-python \
+ --enable-jemalloc \
+ --enable-sdkinstall \
+ --enable-media=gst \
+ --enable-gui=gtk,kde4 \
+ --enable-renderer=agg
+
+config: config-stamp
+config-stamp: patch-stamp
dh_testdir
- @printf "\n == APPLYING PATCHES == \n\n"
- # we have no patches, we're the developers!
-# $(MAKE) -f /usr/share/quilt/quilt.make patch
- @printf "\n ---- End of APPLYING PATCHES ---- \n\n"
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
- # for now, build the kde4 support, as kde3 is being depreciated.
-
- @printf "\n == CONFIGURE == \n\n"
- ./configure CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --disable-dependency-tracking \
- --disable-rpath \
- --enable-cygnal \
- --enable-avm2 \
- --enable-docbook \
- --enable-python \
- --enable-jemalloc \
- --enable-sdkinstall \
- --disable-testsuite \
- --enable-media=gst \
- --enable-gui=gtk,kde4 \
- --enable-renderer=agg \
- --with-plugins-install=system
-
- @printf "\n ---- End of CONFIGURE ---- \n\n"
-
- cp libamf/README README.amf
+# Only run autogen.sh if there isn't a configure script. When
+# building packages from within a configured build directory. In
+# a freshly checked out source tree from bzr, there is no
+# configure script. When building from a source tarball as made
+# by 'make dist', then all the configure scripts are already
+# included.
+ if test ! -e configure; then \
+ printf "\n == AUTOGEN == \n\n"; \
+ $(CURDIR)/autogen.sh; \
+ printf "\n ---- End of AUTOGEN ---- \n\n"; \
+ fi
+
+# Make a sub-directory to build all the objects and executables in.
+ mkdir $(BUILD_DIRECTORY)
+
+# Configure that build subdirectory.
+ printf "\n == CONFIGURE == \n\n"
+ cd $(BUILD_DIRECTORY) && $(CURDIR)/configure VERSION="$(BUILD_VERSION)"
$(CONFIGURE_FLAGS);
+ printf "\n ---- End of CONFIGURE ---- \n\n"
+
+ touch $@
# BUILD
@@ -90,18 +102,19 @@
# package builder to run make check before building packages if the
# state is unknown.
build: build-stamp
-build-stamp: config.status
+build-stamp: config-stamp
dh_testdir
@printf "\n == MAKE == \n\n"
- $(MAKE)
+ $(MAKE) -C $(BUILD_DIRECTORY)
@printf "\n ---- End of MAKE ---- \n\n"
-
+ cp libamf/README README.amf
+ cp cygnal/README README.cygnal
# @printf "\n == CHECK ==\n\n"
-# $(MAKE) -C debuild check
+# $(MAKE) -C $(BUILD_DIRECTORY) check
# @printf "\n ---- End of CHECK ---- \n\n"
- touch build-stamp
+ touch $@
# CLEAN
@@ -113,19 +126,13 @@
dh_testdir
dh_testroot
rm -f build-stamp
- rm -f `find . -name "*.lo"`
- rm -f `find . -name "*.o"`
- rm -f `find . -name "*.a"`
- rm -f `find . -name "*.la"`
- rm -rf `find . -name ".libs"`
- rm -rf `find . -name ".deps"`
- rm -f doc/C/*.1*
+# rm -f doc/C/*.1*
+ rm -fr $(BUILD_DIRECTORY)
@printf "\n == CLEANING PATCHES ==\n\n"
- # we have no patches, we're the developers!
+# we have no patches, we're the developers!
# $(MAKE) -f /usr/share/quilt/quilt.make unpatch
@printf "\n ---- End of CLEANING PATCHES ---- \n\n"
- # rm -rf debuild
dh_clean
@@ -142,16 +149,9 @@
# dh_clean -k
dh_installdirs
- install -d $(CURDIR)/debian/tmp/usr/bin
- install -d $(CURDIR)/debian/tmp/usr/lib
- install -d $(CURDIR)/debian/tmp/usr/lib/gnash/
- install -d $(CURDIR)/debian/tmp/usr/lib/mozilla/plugins/
- install -d $(CURDIR)/debian/tmp/usr/lib/firefox/plugins/
- install -d $(CURDIR)/debian/tmp/usr/include/gnash
-
@printf "\n == INSTALL ==\n\n"
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- $(MAKE) install-plugins DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C $(BUILD_DIRECTORY) install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C $(BUILD_DIRECTORY) install-plugins
DESTDIR=$(CURDIR)/debian/tmp
@printf "\n ---- End of INSTALL ---- \n\n"
install -d $(CURDIR)/debian/tmp/usr/include/gnash/libbase/
@@ -179,11 +179,11 @@
# CREATE PACKAGES
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep:
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
dh_testdir
dh_testroot
dh_installchangelogs -XChangeLog
@@ -200,6 +200,7 @@
dh_compress
dh_fixperms
dh_makeshlibs
+ [ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo
dh_installdeb
dh_shlibdeps debian/tmp/usr/bin/* debian/tmp/usr/lib/gnash/*
dh_gencontrol
@@ -207,17 +208,17 @@
dh_builddeb
VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
-VERSION_ID = trunk_$(VERSION_DATE)
-get-orig-source:
+VERSION_ID = 0.8.7+bzr.trunk$(VERSION_DATE)
+get-bzr-source:
echo Downloading gnash $(VERSION_ID) from CVS...
- #test -e gnashd && exit
- bzr branch http://bzr.savannah.gnu.org/r/gnash/trunk/
- #cd gnash; rm -rf `find . -name CVS`
+# test -e gnashd && exit
+ bzr branch http://bzr.savannah.gnu.org/r/gnash/trunk gnash
+# cd gnash; rm -rf `find . -name CVS`
tar cvfz "gnash_$(VERSION_ID).orig.tar.gz" gnash
mv gnash "gnash-$(VERSION_ID)"
cp debian "gnash-$(VERSION_ID)" -a
- cd "gnash-$(VERSION_ID)"; dch -v "$(VERSION_ID)-1" "New Upstream
Release. Downloaded from CVS."
+ cd "gnash-$(VERSION_ID)"; dch -v "$(VERSION_ID)-1" "New Upstream
Release. Downloaded from Bazaar."
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install get-orig-source
+.PHONY: build clean binary-indep binary-arch binary install get-bzr-source
=== modified file 'packaging/debian/source.lintian-overrides'
--- a/packaging/debian/source.lintian-overrides 2008-02-13 03:16:56 +0000
+++ b/packaging/debian/source.lintian-overrides 2010-02-07 22:02:19 +0000
@@ -1,1 +0,0 @@
-gnash source: source-contains-CVS-dir
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11917: apply a modified patch to make our debian packaging files more similar structurally to Debian's to make comparisons easier. Also now build in sub-directory.,
Rob Savoye <=