Skip to content

Commit 4c60aa4

Browse files
committed
Update Debian packaging and release version 5.0.
* Bump Standards-Version to 3.9.4 (no changes required). * Update Vcs-Git and Vcs-Browser locations to new upstream. * Drop CDBS runtime dependency. CDBS users should be explicitly Build-Depending on CDBS, probably through use of the @cdbs@ macro in debian/control.in.
1 parent 2e4cfd0 commit 4c60aa4

6 files changed

Lines changed: 32 additions & 7 deletions

File tree

debian/changelog

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
config-package-dev (5.0) unstable; urgency=low
2+
3+
* Add Debhelper support (Debathena: #867) (Closes: #693672). This
4+
release includes a new command, dh_configpackage, and a sequencer
5+
extension, dh --with config-package.
6+
* Use the terms "displace" and "hide" for actions of the
7+
config-package-dev system, instead of the terms "divert" and
8+
"remove", which already have existing (related) meanings in the
9+
context of Debian packages.
10+
* Move examples/* to examples/cdbs/*, and create examples/debhelper/*,
11+
with the same packages using Debhelper 7-style packaging.
12+
13+
* Change config-package-dev's own packaging to Debhelper 7.
14+
* Bump Standards-Version to 3.9.4 (no changes required).
15+
* Update Vcs-Git and Vcs-Browser locations to new upstream.
16+
* Drop CDBS runtime dependency. CDBS users should be explicitly
17+
Build-Depending on CDBS, probably through use of the @cdbs@ macro in
18+
debian/control.in.
19+
20+
-- Geoffrey Thomas <geofft@mit.edu> Wed, 06 Mar 2013 17:14:42 -0800
21+
122
config-package-dev (4.14) unstable; urgency=low
223

324
[ Anders Kaseorg ]

debian/config-package-dev.install

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@ config-package.mk usr/share/cdbs/1/rules/
55
transform-files.mk usr/share/cdbs/1/rules/
66
encode usr/share/config-package-dev/
77
decode usr/share/config-package-dev/
8-
displace.sh.in usr/share/config-package-dev/
8+
displace.sh.in usr/share/debhelper/autoscripts/
99
debconf-hack.sh usr/share/config-package-dev/
10+
dh_configpackage usr/bin/
11+
Debian usr/share/perl5/

debian/control

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ Priority: extra
44
Maintainer: Debathena Project <debathena@mit.edu>
55
Uploaders: Tim Abbott <tabbott@mit.edu>, Anders Kaseorg <andersk@mit.edu>, Geoffrey Thomas <geofft@mit.edu>
66
Homepage: http://debathena.mit.edu/config-package-dev
7-
Vcs-Git: git://andersk.mit.edu/config-package-dev.git
8-
Vcs-Browser: http://andersk.mit.edu/gitweb/config-package-dev.git
7+
Vcs-Git: git://debathena.mit.edu/config-package-dev.git
8+
Vcs-Browser: http://debathena.mit.edu/trac/browser/config-package-dev/
99
Build-Depends: debhelper (>= 7.0.50~)
10-
Standards-Version: 3.9.2
10+
Standards-Version: 3.9.4
1111

1212
Package: config-package-dev
1313
Architecture: all
14-
Depends: cdbs, ${misc:Depends}
14+
Depends: ${misc:Depends}
1515
Description: Debhelper (and CDBS) modules for building configuration packages
1616
This package contains a system of modules for creating Debian
1717
configuration packages: packages that configure an existing Debian

debian/copyright

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ The upstream location for this software is now the Debian archive.
66
It is also available from http://debathena.mit.edu/config-package-dev
77

88
Copyright: (C) Tim Abbott and Anders Kaseorg 2006-2008
9+
(C) Geoffrey Thomas 2011-2013
910

1011
This program is free software; you can redistribute it and/or modify
1112
it under the terms of the GNU General Public License as published by
@@ -18,4 +19,4 @@ Copyright: (C) Tim Abbott and Anders Kaseorg 2006-2008
1819
GNU General Public License for more details.
1920

2021
On Debian systems, the complete text of the GNU General Public License
21-
can be found in the file /usr/share/common-licenses/GPL.
22+
can be found in the file /usr/share/common-licenses/GPL-2.

debian/source/format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0 (native)

displace.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), config-package-dev (>= 5.0~)
3434

3535
# displace.sh.in is included in the postinst/prerm scripts of packages
3636
# installing diversions and symlinks using config-package-dev.
37-
DEB_DISPLACE_SCRIPT = /usr/share/config-package-dev/displace.sh.in
37+
DEB_DISPLACE_SCRIPT = /usr/share/debhelper/autoscripts/displace.sh.in
3838
# script used to encode the path of a file uniquely in a valid virtual
3939
# package name.
4040
DEB_DISPLACE_ENCODER = /usr/share/config-package-dev/encode

0 commit comments

Comments
 (0)