gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] gnash/packaging snapshot.am deb.am debian/chang...


From: Rob Savoye
Subject: [Gnash-commit] gnash/packaging snapshot.am deb.am debian/chang...
Date: Mon, 03 Mar 2008 16:02:39 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/03/03 16:02:39

Modified files:
        packaging      : snapshot.am deb.am 
        packaging/debian: changelog rules 

Log message:
        Updated to work with HEAD, initial try. Docs appear to be mised.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/snapshot.am?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/deb.am?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/debian/changelog?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/debian/rules?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: snapshot.am
===================================================================
RCS file: /sources/gnash/gnash/packaging/snapshot.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- snapshot.am 16 Feb 2008 23:12:59 -0000      1.5
+++ snapshot.am 3 Mar 2008 16:02:39 -0000       1.6
@@ -32,7 +32,7 @@
 # This uses the default version for Gnash. which is 'cvs'. So we
 # rename it to the dir we want to stay clear. Then we change the default
 # version from 'cvs' to a date stamped version of cvs, like '20080202cvs'
-snapshot: distdir
+snapshot: distdir dist-hook
        address@hidden "+%Y%m%d"`; \
        pkgname="gnash-$${now}cvs"; \
        snapshot_dir="$${pkgname}"; \
@@ -47,7 +47,7 @@
            $${snapshot_dir}/configure.ac.orig > $${snapshot_dir}/configure.ac; 
\
          cd $${snapshot_dir} ; ./autogen.sh; cd .. ;\
        fi; \
-       tar zcvf $${snapshot_tar} --exclude=$${snapshot_dir}/autom4te.cache \
+       tar zcvf $${snapshot_tar} --exclude="*CVS" 
--exclude=$${snapshot_dir}/autom4te.cache \
          --exclude=$${snapshot_dir}/configure.ac.orig $${snapshot_dir}
 #      $(RM) -fr $${snapshot_dir}
 
@@ -65,12 +65,15 @@
          plugindir=/usr/lib/mozilla/plugins; \
         fi; \
        cd $${snapshot_build}; ../configure \
-       --disable-dependency-tracking --disable-rpath \
+       $(SNAPSHOT_CONFIGURE_FLAGS) \
+         --disable-dependency-tracking\
+         --disable-rpath \
          --prefix=/usr \
          --mandir=/usr/share/man \
          --infodir=/usr/share/info \
          --with-plugindir=$${plugindir} \
-         --disable-static
+         --disable-static \
+         --enable-shared
 #        --with-extensions=all 
 #        --enable-gui=all 
 
@@ -80,7 +83,8 @@
        snapshot_dir="$${pkgname}"; \
        snapshot_build="$${snapshot_dir}/_build"; \
        $(LN_S) -f $${snapshot_build}/packaging/doc 
$${snapshot_build}/packaging/; \
-       $(MAKE) $(AM_MAKEFLAGS) -C $${snapshot_build} all
+       $(MAKE) $(AM_MAKEFLAGS) -C $${snapshot_build}; \
+       $(MAKE) $(AM_MAKEFLAGS) -C $${snapshot_build}/doc/C info man html
 
 # Install a package. Afterwards we link to the prebuilt man pages incase
 # DocBook and DocBook2X aren't installed on this machine.

Index: deb.am
===================================================================
RCS file: /sources/gnash/gnash/packaging/deb.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- deb.am      2 Mar 2008 00:27:21 -0000       1.2
+++ deb.am      3 Mar 2008 16:02:39 -0000       1.3
@@ -29,10 +29,16 @@
 snapshot-deb: # snapshot
        now=`date "+%Y%m%d"`; \
        snapshot_dir="gnash-$${now}cvs"; \
-       mv -f $${snapshot_dir}/packaging/debian/changelog 
$${snapshot_dir}/packaging/debian/changelog.orig; \
-       sed -e "s:(.*):($${now}cvs):" 
$${snapshot_dir}/packaging/debian/changelog.orig > 
$${snapshot_dir}/packaging/debian/changelog; \
-       sed -e "s:(.*):($${now}cvs):" 
$${snapshot_dir}/packaging/debian/changelog.orig > 
$${snapshot_dir}/packaging/debian/changelog; \
-       ln -s $${snapshot_dir}/packaging/debian $${snapshot_dir}/debian;\
-       (cd $${snapshot_dir}; dpkg-buildpackage)
+       if test ! -d $${snapshot_dir}/debian; then \
+         cp -rp $(srcdir)/packaging/debian $${snapshot_dir}/; \
+       fi; \
+       if test -e $${snapshot_dir}/debian/changelog; then \
+         mv -f $${snapshot_dir}/debian/changelog 
$${snapshot_dir}/debian/changelog.orig; \
+         sed -e "s:(.*):($${now}cvs):" $${snapshot_dir}/debian/changelog.orig 
> $${snapshot_dir}/debian/changelog; \
+       fi; \
+       (cd $${snapshot_dir}; dpkg-buildpackage -rfakeroot \
+               -e"\"Rob Savoye <address@hidden>\""
+               -m"\"Rob Savoye <address@hidden>\""
+       )
 
 .PHONY : deb debian 

Index: debian/changelog
===================================================================
RCS file: /sources/gnash/gnash/packaging/debian/changelog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- debian/changelog    3 Mar 2008 04:34:32 -0000       1.6
+++ debian/changelog    3 Mar 2008 16:02:39 -0000       1.7
@@ -1,3 +1,9 @@
+gnash (0.8.2~cvs20080302t0056-0cvs) snapshot; urgency=low
+
+  * be able to make our own deb packages.
+ 
+ -- Rob Savoye <address@hidden>  Sun, 3 March 2008 04:20:00 +0100
+
 gnash (0.8.2~cvs20080223t0056-0ubuntu1) UNRELEASED; urgency=low
 
   * package 0.8.2 preview

Index: debian/rules
===================================================================
RCS file: /sources/gnash/gnash/packaging/debian/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- debian/rules        16 Jan 2008 00:42:55 -0000      1.3
+++ debian/rules        3 Mar 2008 16:02:39 -0000       1.4
@@ -10,6 +10,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 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')
+
 CFLAGS = -Wall -g -Werror-implicit-function-declaration
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -19,8 +21,8 @@
 endif
 
 # shared library versions, option 1
-version=2.0.5
-major=2
+#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)}'`
@@ -29,31 +31,51 @@
 
 # CONFIGURE
 
-configure: configure.ac
+config.status: configure.ac
        dh_testdir
-#      for i in debian/patches/*.diff; do \
-#              test -e "$$i.stamp" || patch -p1 <"$$i" && touch "$$i.stamp"; \
-#              done
+
+       @printf "\n == APPLYING PATCHES 
============================================ \n\n"
+       $(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
+
+       @printf "\n == AUTOGEN 
===================================================== \n\n"
        ./autogen.sh
+       @printf "\n -------------------------------------------- End of AUTOGEN 
---- \n\n"
 
-config.status: configure
-       dh_testdir
-       # Add here commands to configure the package.
-       CXXFLAGS="-g" ./configure --host=$(DEB_HOST_GNU_TYPE) \
-               --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
-               --mandir=\$${prefix}/share/man \
+       @printf "\n == CONFIGURE 
=================================================== \n\n"
+       # In the future, I want to add LDFLAGS="-Wl,-z,defs"
+       ./configure CFLAGS="$(CFLAGS)" \
+               --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+               --prefix=/usr --mandir=\$${prefix}/share/man \
                --infodir=\$${prefix}/share/info \
-               --enable-sdk-install \
-               --with-plugindir=\$${prefix}/lib/mozilla/plugins \
-               --disable-static --enable-klash
+               --enable-cygnal --enable-media=gst --enable-renderer=agg \
+               --with-npapi-plugindir=\$${prefix}/lib/gnash \
+               --enable-shared --disable-static --disable-testsuite \
+               --disable-rpath CXXFLAGS=-O0
+       @printf "\n ------------------------------------------- End of 
CONFIGURE ---- \n\n"
+
+       cp libamf/README README.amf
 
 # BUILD
 
 build: build-stamp
 build-stamp:  config.status
        dh_testdir
-       # Add here commands to compile the package.
+
+       @printf "\n == MAKE 
======================================================== \n\n"
        $(MAKE)
+       @printf "\n ----------------------------------------------- End of MAKE 
---- \n\n"
+
+#      @printf "\n == CHECK 
======================================================= \n\n"
+#      $(MAKE) check
+#      @printf "\n ---------------------------------------------- End of CHECK 
---- \n\n"
 
        touch build-stamp
 
@@ -64,30 +86,37 @@
        dh_testroot
        rm -f build-stamp 
 
+ifeq (Makefile,$(wildcard Makefile))
+       -$(MAKE) maintainer-clean
        -$(MAKE) distclean
-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
 
-       dh_clean 
-
-maintainer-clean:
-       dh_testdir
-       dh_testroot
-       -for i in debian/patches/*.diff; do \
-               test -e "$$i.stamp" && patch -p1 -R <"$$i" && rm -f 
"$$i.stamp"; \
-               done
-       rm -f build-stamp
-ifeq (Makefile,$(wildcard Makefile))
-       $(MAKE) maintainer-clean
-endif
 ifneq ($(wildcard ${AUTO_JUNK}),)
        rm $(wildcard ${AUTO_JUNK})
 endif
-       find . -name Makefile.in -exec rm {} \;
+
+       rm -f config.{sub,guess,log,status}
+       rm -f libtool
+       rm -f `find . -name "Makefile"| grep -v "debian/"`
+       rm -f `find . -name "*.o"`
+       rm -rf `find . -name ".libs"`
+       rm -rf `find . -name ".deps"`
+
+       rm -f configure aclocal.m4 config.h.in
+       #-find . -name Makefile.in -exec rm {} \;
+       -rm `find . -name Makefile.in`
+
+       -rm -rf libltdl/autom4te.cache
+       -rm -f libltdl/* ltmain.sh
+
+       #cd debian/h2m; $(MAKE) clean
+
+       -rm -f README.amf
+
+       @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
@@ -100,9 +129,40 @@
 
        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
-       $(MAKE) install install-plugin DESTDIR=$(CURDIR)/debian/tmp
+
+       @printf "\n == INSTALL 
===================================================== \n\n"
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+       $(MAKE) install-plugins DESTDIR=$(CURDIR)/debian/tmp
+       @printf "\n -------------------------------------------- End of INSTALL 
---- \n\n"
+
+       #cd debian/h2m; $(MAKE)
+
+       install -d $(CURDIR)/debian/tmp/usr/share/lintian/overrides/
+       cp debian/overrides/* $(CURDIR)/debian/tmp/usr/share/lintian/overrides/
+
+       install -d $(CURDIR)/debian/tmp/usr/include/gnash/
+       cp compatibility_include.h $(CURDIR)/debian/tmp/usr/include/gnash/
+       install -d $(CURDIR)/debian/tmp/usr/include/gnash/libbase/
+       cp libbase/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libbase/
+       install -d $(CURDIR)/debian/tmp/usr/include/gnash/libgeometry/
+       cp libgeometry/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libgeometry/
+       install -d $(CURDIR)/debian/tmp/usr/include/gnash/libamf/
+       cp libamf/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libamf/
+       install -d $(CURDIR)/debian/tmp/usr/include/gnash/server/
+       cp server/*.h $(CURDIR)/debian/tmp/usr/include/gnash/server/
+       install -d $(CURDIR)/debian/tmp/usr/include/gnash/backend/
+       cp backend/*.h $(CURDIR)/debian/tmp/usr/include/gnash/backend/
+       install -d $(CURDIR)/debian/tmp/usr/include/gnash/gui/
+       cp gui/*.h $(CURDIR)/debian/tmp/usr/include/gnash/gui/
+
+       install -d $(CURDIR)/debian/tmp/usr/share/pixmaps/
+       cp debian/*.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/
+       install -d $(CURDIR)/debian/tmp/usr/share/applications/
+       cp debian/*.desktop $(CURDIR)/debian/tmp/usr/share/applications/
 
 # CREATE PACKAGES
 
@@ -119,27 +179,31 @@
        dh_installexamples
        dh_install --sourcedir=$(CURDIR)/debian/tmp
 #      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
 #      dh_installmime
-#      dh_installinit
-#      dh_installcron
-       dh_installinfo
        dh_installman
        dh_link
        dh_strip
        dh_compress
        dh_fixperms
-#      dh_perl
-#      dh_python
-#      dh_makeshlibs
+       dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol
        dh_md5sums
        dh_builddeb
 
+VERSION_DATE = $(shell /bin/date --utc +%0Y%0m%0d.%0k%0M)
+VERSION_ID = 0.7.2+cvs$(VERSION_DATE)
+get-orig-source:
+       echo Downloading gnash $(VERSION_ID) from CVS...
+       #test -e gnashd && exit
+       export CVS_RSH="ssh"; cvs -z3 -d:pserver:address@hidden:/sources/gnash 
co 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."
+
+
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install get-orig-source




reply via email to

[Prev in Thread] Current Thread [Next in Thread]