[SCM] tora Debian packaging branch, master, updated. upstream/2.1.1-26-g54936b6
Michael Meskes
meskes at alioth.debian.org
Tue Mar 30 14:09:00 UTC 2010
The following commit has been merged in the master branch:
commit 1aac7bee7df94ac18863f0c7f45e3029fb5a8124
Author: Michael Meskes <meskes at debian.org>
Date: Tue Mar 30 15:41:25 2010 +0200
No patches needed anymore, removed patch system.
---
debian/README.source | 57 --------------------------------
debian/changelog | 1 +
debian/control | 2 +-
debian/patches/00list | 1 -
debian/patches/03_README.LAYOUT.dpatch | 19 ----------
debian/rules | 1 -
6 files changed, 2 insertions(+), 79 deletions(-)
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 8646078..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
diff --git a/debian/changelog b/debian/changelog
index 0f37304..4be304f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ tora (2.1.2-1) unstable; urgency=low
* New: Initial support for creating/modifying tables
* Bugfixes
* Bumped Standards-Version to 3.8.4, no changes needed.
+ * No patches needed anymore, removed patch system.
-- Michael Meskes <meskes at debian.org> Tue, 30 Mar 2010 13:14:16 +0200
diff --git a/debian/control b/debian/control
index a0e0bda..915978f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Michael Meskes <meskes at debian.org>
-Build-Depends: debhelper (>= 5), kdelibs5-dev, kdebase-bin, dpatch, libqscintilla2-dev, cdbs, libpq-dev
+Build-Depends: debhelper (>= 5), kdelibs5-dev, kdebase-bin, libqscintilla2-dev, cdbs, libpq-dev
Standards-Version: 3.8.4
Homepage: http://www.torasql.com
Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/tora.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index a4b5c9b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-03_README.LAYOUT
diff --git a/debian/patches/03_README.LAYOUT.dpatch b/debian/patches/03_README.LAYOUT.dpatch
deleted file mode 100755
index 624da68..0000000
--- a/debian/patches/03_README.LAYOUT.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_README.LAYOUT.dpatch by Michael Meskes <meskes at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No such file README.LAYOUT
-
- at DPATCH@
-
-diff -ruN tora-2.0.0.orig/CMakeLists.txt tora-2.0.0/CMakeLists.txt
---- tora-2.0.0.orig/CMakeLists.txt 2008-11-03 21:32:20.000000000 +0100
-+++ tora-2.0.0/CMakeLists.txt 2009-01-03 21:29:48.000000000 +0100
-@@ -282,7 +282,6 @@
- README.BINARIES
- README.CMAKE
- README.CODESTYLE
-- README.LAYOUT
- README.LICENSE
- README.OSX
- README.RELEASE
diff --git a/debian/rules b/debian/rules
index e386189..dd37f11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
DEB_KDE_ENABLE_FINAL := yes
DEB_DBG_PACKAGES := tora-dbg
--
tora Debian packaging
More information about the pkg-kde-commits
mailing list