Package: tinymce2
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From ae7a639585704b2ea48d234915e4a5dc2ed2ca5f Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Mon, 30 Apr 2012 20:40:38 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 10 ++++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/copyright | 4 ++--
debian/patches/00list | 1 -
...reen-content-css.dpatch => fullscreen-content-css.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 11 +++++++----
debian/source/format | 1 +
9 files changed, 26 insertions(+), 16 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{fullscreen-content-css.dpatch => fullscreen-content-css.patch} (54%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index d23d15e..df558ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tinymce2 (2.1.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Mon, 30 Apr 2012 20:39:52 +0300
+
tinymce2 (2.1.3-1) unstable; urgency=low
* Repackage tinymce as tinymce2 package since tinymce v3 is not
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index cc01970..014b2dc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: tinymce2
Section: web
Priority: optional
Maintainer: Vincent Bernat <ber...@debian.org>
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Vcs-Browser: http://git.debian.org/?p=collab-maint/tinymce2.git
Vcs-Git: git://git.debian.org/git/collab-maint/tinymce2.git
Homepage: http://tinymce.moxiecode.com/
diff --git a/debian/copyright b/debian/copyright
index 8ac1e54..30061f1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,7 +23,7 @@ Full list: http://tinymce.moxiecode.com/tinymce/docs/credits.html
Copyright: Copyright © 2003-2006 Moxiecode Systems AB
-License: TinyMCE is licensed under the LGPL, see `/usr/share/common-licenses/LGPL'.
+License: TinyMCE is licensed under the LGPL, see `/usr/share/common-licenses/LGPL-2'.
The Debian packaging is © 2006, Alexis Sukrieh <suk...@debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ef500bc..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-fullscreen-content-css
diff --git a/debian/patches/fullscreen-content-css.dpatch b/debian/patches/fullscreen-content-css.patch
similarity index 54%
rename from debian/patches/fullscreen-content-css.dpatch
rename to debian/patches/fullscreen-content-css.patch
index e6add98..fdd816f 100644
--- a/debian/patches/fullscreen-content-css.dpatch
+++ b/debian/patches/fullscreen-content-css.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fullscreen-content-css.dpatch
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Ship fullscreen/css/content.css
+From: Unknown
+Subject: Ship fullscreen/css/content.css
-@DPATCH@
--- tinymce-2.1.1.1.orig/jscripts/tiny_mce/plugins/fullscreen/css/content.css
+++ tinymce-2.1.1.1/jscripts/tiny_mce/plugins/fullscreen/css/content.css
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e253f67
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fullscreen-content-css.patch
diff --git a/debian/rules b/debian/rules
index d1f1e6f..9d611da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
# -*- makefile -*-
-include /usr/share/dpatch/dpatch.make
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -12,13 +11,17 @@ configure-stamp:
dh_testdir
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: configure-stamp patch
+build-stamp: configure-stamp
dh_testdir
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -27,7 +30,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# static files (html and js)
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.10
