From 190d4a1c76831bcf3ed13f30f2d5f3edb4e91e54 Mon Sep 17 00:00:00 2001 From: Miriam Ruiz Date: Sat, 9 Jul 2011 02:43:49 +0200 Subject: [PATCH] New Upstream Release (2.9.1) Changed to DebSrc 3.0 --- changelog | 7 ++++++ control | 4 +-- copyright | 11 ++++----- patches/add-missing-constructor.patch | 46 +++++++++++++++++++++++++++++++++++ patches/series | 1 + remove-nonfree.sh | 4 +++ rules | 18 +++++++------- source/format | 1 + source/options | 5 ++++ 9 files changed, 80 insertions(+), 17 deletions(-) create mode 100644 patches/add-missing-constructor.patch create mode 100644 patches/series create mode 100644 source/format create mode 100644 source/options diff --git a/changelog b/changelog index c0ab934..3409b0c 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,10 @@ +celtx (2.9.1+dfsg1-0inniyah1) UNRELEASED; urgency=low + + * New Upstream Release + * Upgraded Standards-Version from 3.8.4 to 3.9.2 + + -- Miriam Ruiz Sat, 09 Jul 2011 02:13:32 +0200 + celtx (2.7+dfsg1-0inniyah1) UNRELEASED; urgency=low * New Upstream Release diff --git a/control b/control index 53f232f..83c3d4b 100644 --- a/control +++ b/control @@ -2,11 +2,11 @@ Source: celtx Section: editors Priority: extra Maintainer: Miriam Ruiz -Build-Depends: debhelper (>= 7), dh-buildinfo, autotools-dev, zip, uuid-runtime, +Build-Depends: debhelper (>= 7), dh-buildinfo, autotools-dev, zip, uuid-runtime, quilt, libgtk2.0-dev, libidl-dev, libxt-dev, libgnomevfs2-dev, libxft-dev, libnspr4-dev, libnss3-dev, libsqlite3-dev, libcurl4-openssl-dev | libcurl4-openssl-dev, libdbus-glib-1-dev, liblcms1-dev -Standards-Version: 3.8.4 +Standards-Version: 3.9.2 Homepage: http://www.celtx.com VCS-Browser: http://repo.or.cz/w/celtx-debian.git VCS-Git: git://repo.or.cz/celtx-debian.git diff --git a/copyright b/copyright index e16c6fc..1a4cded 100644 --- a/copyright +++ b/copyright @@ -1,13 +1,12 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat -Upstream-Source: http://www.celtx.com -Upstream-Maintainer: UPSTREAM NAME +Format: http://dep.debian.net/deps/dep5/ +Upstream-Name: celtx +Upstream-Contact: UPSTREAM NAME +Source: http://download.celtx.com/source/celtx-2-9-1-src.tar.bz2 Debianized-By: Miriam Ruiz Debianized-Date: Wed, 20 May 2009 00:05:48 +0200 Files: * -Copyright: Copyright (C) YYYY OWNER 1 OF COPYRIGHT - Copyright (C) YYYY OWNER 2 OF COPYRIGHT - Copyright (C) YYYY OWNER 3 OF COPYRIGHT +Copyright: Copyright (C) YYYY OWNER OF COPYRIGHT Licence: other CePL - Version 1.3 ( http://www.celtx.com/CePL/ ) AMENDMENTS diff --git a/patches/add-missing-constructor.patch b/patches/add-missing-constructor.patch new file mode 100644 index 0000000..5aeab77 --- /dev/null +++ b/patches/add-missing-constructor.patch @@ -0,0 +1,46 @@ +# HG changeset patch +# Parent 524a8ae76bace97a2cd8ab7bdb84ba78cc852c55 + +# See: https://bugzilla.mozilla.org/show_bug.cgi?id=623126 +# See: http://bugs.debian.org/624969 + +--- celtx.orig/mozilla/xpcom/base/nsDebugImpl.h ++++ celtx/mozilla/xpcom/base/nsDebugImpl.h +@@ -39,6 +39,7 @@ + class nsDebugImpl : public nsIDebug + { + public: ++ nsDebugImpl() {} + NS_DECL_ISUPPORTS + NS_DECL_NSIDEBUG + +--- celtx.orig/mozilla/xpcom/base/nsTraceRefcntImpl.h ++++ celtx/mozilla/xpcom/base/nsTraceRefcntImpl.h +@@ -44,6 +44,7 @@ + class nsTraceRefcntImpl : public nsITraceRefcnt + { + public: ++ nsTraceRefcntImpl() {} + NS_DECL_ISUPPORTS + NS_DECL_NSITRACEREFCNT + +--- celtx.orig/mozilla/xpcom/glue/nsEnumeratorUtils.cpp ++++ celtx/mozilla/xpcom/glue/nsEnumeratorUtils.cpp +@@ -52,6 +52,7 @@ + public nsIStringEnumerator + { + public: ++ EmptyEnumeratorImpl() {} + // nsISupports interface + NS_DECL_ISUPPORTS_INHERITED // not really inherited, but no mRefCnt + +--- celtx.orig/mozilla/xpcom/io/nsUnicharInputStream.h ++++ celtx/mozilla/xpcom/io/nsUnicharInputStream.h +@@ -50,6 +50,7 @@ + public nsIFactory, nsISimpleUnicharStreamFactory + { + public: ++ nsSimpleUnicharStreamFactory() {} + NS_DECL_ISUPPORTS_INHERITED + NS_DECL_NSIFACTORY + NS_DECL_NSISIMPLEUNICHARSTREAMFACTORY diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..22deebb --- /dev/null +++ b/patches/series @@ -0,0 +1 @@ +add-missing-constructor.patch diff --git a/remove-nonfree.sh b/remove-nonfree.sh index 0bc11bc..69157c3 100644 --- a/remove-nonfree.sh +++ b/remove-nonfree.sh @@ -105,6 +105,10 @@ rm -fv ./mailnews/addrbook/src/nsAbOSXDirFactory.o rm -fv ./mailnews/addrbook/src/nsAbOSXDirectory.o rm -fv ./mailnews/addrbook/src/nsAbOSXUtils.o +rm -fv mozilla/toolkit/crashreporter/tools/win32/dump_syms.exe +rm -fv mozilla/memory/jemalloc/ed.exe +rm -rfv mozilla/redist/microsoft/ + echo also we need to remove any copyrighted image files from the mozilla src suite, not replaced by the branding process. This includes theme throbbers depending on how you handle that and windows icons, app icons, windows splash etc rm -fv ./xpfe/bootstrap/splash.bmp diff --git a/rules b/rules index 3ac1756..abf982b 100755 --- a/rules +++ b/rules @@ -132,7 +132,6 @@ binary-arch: install # dh_installmime -a # dh_python -a dh_installman -a -# dh_desktop -a dh_link -a dh_strip -a --dbg-package=celtx-dbg dh_compress -a @@ -147,14 +146,15 @@ binary-arch: install dh_builddeb -a get-orig-source: - rm -f celtx-2-7-src.tar.bz2 - wget http://download.celtx.com/source/celtx-2-7-src.tar.bz2 - rm -rf celtx-2-7-src - tar xvfj celtx-2-7-src.tar.bz2 - rm celtx-2-7-src.tar.bz2 - cd celtx-2-7-src && sh ../debian/remove-nonfree.sh - tar cvfz ../celtx_2.7+dfsg1.orig.tar.gz celtx-2-7-src - rm -rf celtx-2-7-src + rm -fv celtx-2-9-1-src.tar.bz2 + wget http://download.celtx.com/source/celtx-2-9-1-src.tar.bz2 + rm -rf celtx-2-9-1-src + tar xvfj celtx-2-9-1-src.tar.bz2 + rm -v celtx-2-9-1-src.tar.bz2 + rm -fv ../celtx_2.9.1+dfsg1.orig.tar.gz + cd celtx-2-9-1-src && sh ../debian/remove-nonfree.sh + tar cvfj ../celtx_2.9.1+dfsg1.orig.tar.bz2 celtx-2-9-1-src + rm -rf celtx-2-9-1-src binary: binary-indep binary-arch .PHONY: config build clean binary-indep binary-arch binary install get-orig-source diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/source/options b/source/options new file mode 100644 index 0000000..e6227d6 --- /dev/null +++ b/source/options @@ -0,0 +1,5 @@ +# Bzip2 compression for debian.tar +compression = "bzip2" +compression-level = 7 +# Do not generate diff for changes in config.(sub|guess) +extend-diff-ignore = "(^|/)config.(sub|guess)$" -- 2.11.4.GIT