r243 - in /packages/ming/trunk/debian: control mkfontset patches/ patches/01_perl_vendor patches/series rules
anderson at users.alioth.debian.org
anderson at users.alioth.debian.org
Tue May 20 19:28:27 UTC 2008
Author: anderson
Date: Tue May 20 19:28:26 2008
New Revision: 243
URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=243
Log:
Set up for, and use local patches. Fix more lintian complaints.
Added:
packages/ming/trunk/debian/patches/
packages/ming/trunk/debian/patches/01_perl_vendor
packages/ming/trunk/debian/patches/series
Modified:
packages/ming/trunk/debian/control
packages/ming/trunk/debian/mkfontset
packages/ming/trunk/debian/rules
Modified: packages/ming/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/ming/trunk/debian/control?rev=243&op=diff
==============================================================================
--- packages/ming/trunk/debian/control (original)
+++ packages/ming/trunk/debian/control Tue May 20 19:28:26 2008
@@ -24,7 +24,7 @@
Package: libming-dev
Section: libdevel
Architecture: any
-Depends: libming0 (= ${Source-Version})
+Depends: libming0
Description: Library to generate SWF (Flash) Files (development files)
Ming is an SWF (Flash) file format output library.
It is written in C, with wrappers for C++, Perl, Python,
@@ -61,7 +61,7 @@
Package: libswf-perl
Architecture: any
Section: perl
-Depends: libming0 (= ${Source-Version}), ${shlibs:Depends}, ${perl:Depends}
+Depends: libming0, ${shlibs:Depends}, ${perl:Depends}
Suggests: libming-fonts-openoffice
Description: Ming (SWF) module for Perl
Ming is an SWF (Flash) file format output library.
Modified: packages/ming/trunk/debian/mkfontset
URL: http://svn.debian.org/wsvn/pkg-flash/packages/ming/trunk/debian/mkfontset?rev=243&op=diff
==============================================================================
--- packages/ming/trunk/debian/mkfontset (original)
+++ packages/ming/trunk/debian/mkfontset Tue May 20 19:28:26 2008
@@ -22,7 +22,7 @@
do
fname=`basename $font .ttf`
cd $topdir/fonts/$dstname/fft
- LD_LIBRARY_PATH=$topdir/src/.libs $topdir/debian/ttftofft.pl $setname $fname
+ LD_LIBRARY_PATH=$topdir/src/.libs perl $topdir/debian/ttftofft.pl $setname $fname
cd $topdir/fonts/$dstname/fdb
LD_LIBRARY_PATH=$topdir/src/.libs $topdir/util/makefdb $topdir/fonts/$dstname/fft/$fname.fft
mv $topdir/fonts/$dstname/fdb/font0.fdb $topdir/fonts/$dstname/fdb/$fname.fdb
Added: packages/ming/trunk/debian/patches/01_perl_vendor
URL: http://svn.debian.org/wsvn/pkg-flash/packages/ming/trunk/debian/patches/01_perl_vendor?rev=243&op=file
==============================================================================
--- packages/ming/trunk/debian/patches/01_perl_vendor (added)
+++ packages/ming/trunk/debian/patches/01_perl_vendor Tue May 20 19:28:26 2008
@@ -1,0 +1,13 @@
+Index: ming-0.4.0.beta5.cvs20080518/perl_ext/Makefile.am
+===================================================================
+--- ming-0.4.0.beta5.cvs20080518.orig/perl_ext/Makefile.am 2008-05-20 10:35:21.000000000 -0400
++++ ming-0.4.0.beta5.cvs20080518/perl_ext/Makefile.am 2008-05-20 10:35:54.000000000 -0400
+@@ -38,7 +38,7 @@
+ $(MAKE) -f Makefile.perl install PREFIX=$(prefix)
+
+ Makefile.perl: Makefile.PL
+- srcdir=$(srcdir) builddir=$(abs_builddir) $(PERL) $< PREFIX=$(prefix) FIRST_MAKEFILE=Makefile.perl
++ srcdir=$(srcdir) builddir=$(abs_builddir) $(PERL) $< PREFIX=$(prefix) FIRST_MAKEFILE=Makefile.perl INSTALLDIRS=vendor
+
+ clean-local: Makefile.perl
+ $(MAKE) -f Makefile.perl realclean
Added: packages/ming/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/ming/trunk/debian/patches/series?rev=243&op=file
==============================================================================
--- packages/ming/trunk/debian/patches/series (added)
+++ packages/ming/trunk/debian/patches/series Tue May 20 19:28:26 2008
@@ -1,0 +1,1 @@
+01_perl_vendor
Modified: packages/ming/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/ming/trunk/debian/rules?rev=243&op=diff
==============================================================================
--- packages/ming/trunk/debian/rules (original)
+++ packages/ming/trunk/debian/rules Tue May 20 19:28:26 2008
@@ -35,7 +35,17 @@
config.status: configure
dh_testdir
- # Add here commands to configure the package.
+
+ $(MAKE) -f /usr/share/quilt/quilt.make patch
+
+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
+ ./autogen.sh
+
CFLAGS="$(CFLAGS)" ./configure \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
@@ -45,21 +55,7 @@
--enable-perl \
--enable-php \
--enable-python
-# # PHP5
-# rm -rf build-php5 && mkdir build-php5
-# cp php_ext/* build-php5
-# -cd build-php5 && phpize5
-# cd build-php5 && ./configure --build=$(DEB_BUILD_GNU_TYPE) \
-# --host=$(DEB_HOST_GNU_TYPE) \
-# --prefix=/usr \
-# --with-php-config=/usr/bin/php-config5 \
-# --disable-rpath \
-# --disable-static \
-# --with-ming
-
-
-
-#Architecture
+
build: build-arch build-indep
build-arch: build-arch-stamp
@@ -68,30 +64,16 @@
# Add here commands to compile the arch part of the package.
$(MAKE)
+ # Some tests are missing upstream, so this fails
#$(MAKE) check
-
- # Perl extension
-# cd perl_ext \
-# && perl Makefile.PL INSTALLDIRS=vendor \
-# && $(MAKE) OPTIMIZE="-O2 -Wall"
-#
-# # Python extension
-# for python in $(PYVERS); do \
-# python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
-# (cd py_ext;$$python setup.py build;) \
-# done
-#
-# # PHP5
-# cd build-php5 && $(MAKE) CFLAGS="$(CFLAGS)"
touch build-arch-stamp
build-indep: build-indep-stamp
build-indep-stamp: config.status
- # Add here commands to compile the indep part of the package.
- #$(MAKE) doc
$(SHELL) debian/mkfontset ttf-dejavu
+ #Move file name to be the same as in 0.3.0 for compatability
mv fonts/ttf-dejavu/fdb/DejaVuSans-BoldOblique.fdb "fonts/ttf-dejavu/fdb/DejaVu Sans-B-I.fdb"
mv fonts/ttf-dejavu/fdb/DejaVuSans-Bold.fdb "fonts/ttf-dejavu/fdb/DejaVu Sans-B.fdb"
mv fonts/ttf-dejavu/fdb/DejaVuSans-Oblique.fdb "fonts/ttf-dejavu/fdb/DejaVu Sans-I.fdb"
@@ -106,31 +88,33 @@
mv fonts/ttf-dejavu/fdb/DejaVuSerif.fdb "fonts/ttf-dejavu/fdb/DejaVu Serif.fdb"
$(SHELL) debian/mkfontset openoffice opensymbol
+ #Move file name to be the same as in 0.3.0 for compatability
mv fonts/opensymbol/fdb/opens___.fdb fonts/opensymbol/fdb/OpenSymbol.fdb
+
touch build-indep-stamp
clean:
dh_testdir
dh_testroot
-# # Perl extension
-# -cd perl_ext && $(MAKE) realclean && rm SWF.h t/config.pl
-
- -$(MAKE) clean
-
-# # Python extension
-# -for python in $(PYVERS); do \
-# python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
-# (cd py_ext;$$python setup.py clean;) \
-# done
+
+ if [ -f Makefile ] ;\
+ then \
+ $(MAKE) clean; \
+ fi
rm -rf debian/ming
rm -rf fonts
- rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+ rm -f build-arch-stamp build-indep-stamp
# Add here commands to clean up after the build process.
-# rm -rf build-php5
rm -f libming-util.1
- -$(MAKE) distclean
+ #$(MAKE) distclean
+ rm -f config.log
+ #rm -f configure aclocal.m4
+ #-rm `find . -name Makefile.in`
+
+ $(MAKE) -f /usr/share/quilt/quilt.make unpatch
+
dh_clean
install: install-arch install-indep
@@ -164,7 +148,6 @@
dh_installman -p libming-util libming-util.1
# # Perl extension
-# cd perl_ext && $(MAKE) install PREFIX=$(CURDIR)/debian/ming/usr
# strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/ming/usr/lib/perl5/auto/SWF/SWF.so
# install Python extension
@@ -173,8 +156,6 @@
(cd py_ext;$$python setup.py install --root=../debian/python-ming; )\
done
-# # PHP5
-# (ext=`/usr/bin/php-config5 --extension-dir`;mkdir -p debian/php5-ming/$${ext};install -m 644 -o root -g root build-php5/modules/ming.so debian/php5-ming/$${ext}/ming.so;)
install -d debian/php5-ming/etc/php5/conf.d
install -m 644 -o root -g root debian/ming.ini debian/php5-ming/etc/php5/conf.d/ming.ini
More information about the pkg-flash-devel
mailing list