xterm: Changes to 'debian-unstable'
debian/README.source | 49 --------------------------------------------
debian/changelog | 10 ++++++++
debian/compat | 2 -
debian/control | 8 +++----
debian/rules | 5 +++-
debian/source/format | 1
debian/source/local-options | 1
7 files changed, 21 insertions(+), 55 deletions(-)
New commits:
commit 6c59baaac7f8e16814a6f9189d3f164c209a06c3
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Nov 12 19:53:42 2016 +0100
Keep the Debian patches unapplied in git
This retains the existing packaging workflow, merging new upstream
releases with the patches applied is not so easy.
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches
commit 3ea7e457e20c1860eed417ce6e57e71aa4cb05ef
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Nov 12 19:43:52 2016 +0100
Switch to format 3.0 (quilt)
It has happened several times to me that I merged a new upstream
release without bumping debian/changelog or vice versa and only
noticed this problem when I ran lintian. In the 3.0 (quilt) format,
dpkg-source catches this mistake early.
The only advantage of the 1.0 format is that it is easier to
cherry-pick changes from upstream if they also use git, which is not
the case with xterm.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 4ecd5e6..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,49 +0,0 @@
-------------------------------------------------------
-Quick Guide To Patching This Package For The Impatient
-------------------------------------------------------
-
-1. Make sure you have quilt installed
-2. Unpack the package as usual with "dpkg-source -x"
-3. Run the "patch" target in debian/rules
-4. Create a new patch with "quilt new" (see quilt(1))
-5. Edit all the files you want to include in the patch with "quilt edit"
- (see quilt(1)).
-6. Write the patch with "quilt refresh" (see quilt(1))
-7. Run the "clean" target in debian/rules
-
-Alternatively, instead of using quilt directly, you can drop the patch in to
-debian/patches and add the name of the patch to debian/patches/series.
-
-------------------------------------
-Guide To The X Strike Force Packages
-------------------------------------
-
-The X Strike Force team maintains X packages in git repositories on
-git.debian.org in the pkg-xorg subdirectory. Most upstream packages
-are actually maintained in git repositories as well, so they often
-just need to be pulled into git.debian.org in a "upstream-*" branch.
-Otherwise, the upstream sources are manually installed in the Debian
-git repository.
-
-The .orig.tar.gz upstream source file could be generated using this
-"upstream-*" branch in the Debian git repository but it is actually
-copied from upstream tarballs directly.
-
-Due to X.org being highly modular, packaging all X.org applications
-as their own independent packages would have created too many Debian
-packages. For this reason, some X.org applications have been grouped
-into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
-x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
-Most packages, including the X.org server itself and all libraries
-and drivers are, however maintained independently.
-
-The Debian packaging is added by creating the "debian-*" git branch
-which contains the aforementioned "upstream-*" branch plus the debian/
-repository files.
-When a patch has to be applied to the Debian package, two solutions
-are involved:
-* If the patch is available in one of the upstream branches, it
- may be git'cherry-picked into the Debian repository. In this
- case, it appears directly in the .diff.gz.
-* Otherwise, the patch is added to debian/patches/ which is managed
- with quilt as documented in /usr/share/doc/quilt/README.source.
diff --git a/debian/changelog b/debian/changelog
index 22e2c6f..ae26e2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xterm (327-2) UNRELEASED; urgency=medium
* Bump debhelper compatibility level to 10.
- Add autoconf-dickey to Build-Depends and an override for
dh_autoreconf to debian/rules.
+ * Switch to format 3.0 (quilt).
+ - Drop quilt from Build-Depends and delete debian/README.source.
-- Sven Joachim <svenjoac@gmx.de> Sat, 12 Nov 2016 19:19:33 +0100
diff --git a/debian/control b/debian/control
index 8359ac7..430f6a6 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends:
libxcursor-dev,
libxinerama-dev,
debhelper (>= 10),
- quilt,
autotools-dev,
autoconf-dickey,
lynx | lynx-cur,
@@ -107,7 +106,6 @@ Build-Depends:
# xorg-docs-core provides X(7) which minstall.sh tries to
# detect
# debhelper (>= 10) debian/compat = 10
-# quilt patch management system
# autotools-dev update config.guess, config.sub
# autoconf-dickey regenerate configure
# lynx | lynx-cur generates plain-text version of xterm faq
diff --git a/debian/rules b/debian/rules
index 339bb8d..a35d111 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ override_dh_install:
dh_install --fail-missing
%:
- dh $@ --with quilt,autotools_dev --builddirectory=build/ --parallel
+ dh $@ --with autotools_dev --builddirectory=build/ --parallel
debian/local/xterm.faq.html:
wget -O $@ http://invisible-island.net/xterm/xterm.faq.html
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)
commit f9c5854b83996ca452a403e3ef99870533c49df8
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sat Nov 12 19:20:17 2016 +0100
Bump debhelper compatibility level to 10
Since debhelper runs dh_autoreconf in that compat level, add the
necessary build dependency on autoconf-dickey, normal autotools don't
work with Thomas' packages. A rebuild shows that the contents of the
binary package do not change.
diff --git a/debian/changelog b/debian/changelog
index 3373d03..22e2c6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xterm (327-2) UNRELEASED; urgency=medium
+
+ * Bump debhelper compatibility level to 10.
+ - Add autoconf-dickey to Build-Depends and an override for
+ dh_autoreconf to debian/rules.
+
+ -- Sven Joachim <svenjoac@gmx.de> Sat, 12 Nov 2016 19:19:33 +0100
+
xterm (327-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index cad9cef..8359ac7 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,10 @@ Build-Depends:
libutempter-dev,
libxcursor-dev,
libxinerama-dev,
- debhelper (>= 9),
+ debhelper (>= 10),
quilt,
autotools-dev,
+ autoconf-dickey,
lynx | lynx-cur,
xorg-docs-core,
desktop-file-utils,
@@ -105,9 +106,10 @@ Build-Depends:
# util.c:#ifdef HAVE_X11_EXTENSIONS_XINERAMA_H
# xorg-docs-core provides X(7) which minstall.sh tries to
# detect
-# debhelper (>= 9) debian/compat = 9
+# debhelper (>= 10) debian/compat = 10
# quilt patch management system
# autotools-dev update config.guess, config.sub
+# autoconf-dickey regenerate configure
# lynx | lynx-cur generates plain-text version of xterm faq
# desktop-file-utils for installing xterm.desktop
diff --git a/debian/rules b/debian/rules
index 8172763..339bb8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,9 @@ CPPFLAGS += \
-DDEF_ALLOW_TCAP=False \
-DDEF_DISALLOWED_WINDOW=\\\"1,2,3,4,5,6,7,8,9,11,13,14,18,19,20,21,GetSelection,SetSelection,SetWinLines,SetXprop\\\"
+override_dh_autoreconf:
+ dh_autoreconf autoreconf-dickey -- -f -i
+
override_dh_auto_configure:
dh_auto_configure -- \
--exec-prefix=/usr \
Reply to: