[26863] in Source-Commits
/svn/athena r25800 - in trunk/debathena/debathena/config-package-dev: . debian examples/debathena-bin-example-1.0/debian examples/debathena-bin-example-1.1/debian examples/debathena-conffile-example-1.0/debian examples/debathena-cron-example-1.0/debian examples/debathena-transform-example-1.0/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Fri Dec 7 11:06:09 2012
Date: Fri, 7 Dec 2012 11:06:01 -0500
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201212071606.qB7G61dr013868@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2012-12-07 11:06:01 -0500 (Fri, 07 Dec 2012)
New Revision: 25800
Modified:
trunk/debathena/debathena/config-package-dev/check-files.mk
trunk/debathena/debathena/config-package-dev/config-package.mk
trunk/debathena/debathena/config-package-dev/debconf-divert.mk
trunk/debathena/debathena/config-package-dev/debian/changelog
trunk/debathena/debathena/config-package-dev/debian/control
trunk/debathena/debathena/config-package-dev/debian/control.in
trunk/debathena/debathena/config-package-dev/divert.mk
trunk/debathena/debathena/config-package-dev/divert.sh.in
trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.0/debian/control
trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.0/debian/control.in
trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.1/debian/control
trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.1/debian/control.in
trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/control
trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/control.in
trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/rules
trunk/debathena/debathena/config-package-dev/examples/debathena-cron-example-1.0/debian/control
trunk/debathena/debathena/config-package-dev/examples/debathena-cron-example-1.0/debian/control.in
trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/control
trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/control.in
trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/rules
Log:
Modified: trunk/debathena/debathena/config-package-dev/check-files.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/check-files.mk 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/check-files.mk 2012-12-07 16:06:01 UTC (rev 25800)
@@ -38,8 +38,7 @@
DEB_CHECK_FILES_TMPDIR = debian/check_file_copies
-debian_check_files_source = $(if $(DEB_CHECK_FILES_SOURCE_$(1)),$(DEB_CHECK_FILES_SOURCE_$(1)),$(1))
-debian_check_files_check = $(call divert_files_replace_name,$(call debian_check_files_source,$(1)))
+debian_check_files_source = $(if $(DEB_CHECK_FILES_SOURCE_$(1)),$(DEB_CHECK_FILES_SOURCE_$(1)),$(call divert_files_replace_name,$(1)))
debian_check_files = $(patsubst %,$(DEB_CHECK_FILES_TMPDIR)%,$(1))
undebian_check_files = $(patsubst $(DEB_CHECK_FILES_TMPDIR)%,%,$(1))
@@ -59,7 +58,7 @@
#
# There is some wrangling here because the formats of these sources differ.
$(call debian_check_files_tmp,%): target = $(call undebian_check_files_tmp,$@)
-$(call debian_check_files_tmp,%): name = $(call debian_check_files_check,$(target))
+$(call debian_check_files_tmp,%): name = $(call debian_check_files_source,$(target))
$(call debian_check_files_tmp,%): truename = $(shell /usr/sbin/dpkg-divert --truename $(name))
$(call debian_check_files_tmp,%): package = $(shell LC_ALL=C dpkg -S $(name) | sed -n '/^diversion by /! s/: .*$$// p')
$(call debian_check_files_tmp,%): $(truename)
Modified: trunk/debathena/debathena/config-package-dev/config-package.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/config-package.mk 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/config-package.mk 2012-12-07 16:06:01 UTC (rev 25800)
@@ -60,7 +60,7 @@
# These variables have the following defaults:
#
# DEB_TRANSFORM_SCRIPT_path/file.divert = debian/transform_file.divert
-# DEB_CHECK_FILES_SOURCE_/path/file.divert = path/file
+# DEB_CHECK_FILES_SOURCE_/path/file.divert = /path/file
#
# If DEB_CHECK_FILES_SOURCE_/path/file.divert does not match the
# md5sums shipped with the package containing it, the package build
@@ -68,7 +68,11 @@
# (potentially long) configuration file that will work on several
# Debian versions. We recommend using DEB_TRANSFORM_FILES in
# conjunction with pbuilder, sbuild, or another tool for building
-# Debian packages in a clean environment.
+# Debian packages in a clean environment. (That said, if /path/file is
+# diverted on the running system, DEB_CHECK_FILES_SOURCE does
+# reverse-resolve the diversion and default to the original version of
+# the file, to allow you to rebuild a package using DEB_TRANSFORM_FILES
+# that is currently installed, in most cases.)
#
# DEB_REMOVE_FILES_package += /path/file
#
Modified: trunk/debathena/debathena/config-package-dev/debconf-divert.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/debconf-divert.mk 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/debconf-divert.mk 2012-12-07 16:06:01 UTC (rev 25800)
@@ -27,7 +27,7 @@
DEB_DEBCONF_HACK_PACKAGES += $(foreach package,$(DEB_ALL_PACKAGES), \
$(if $(wildcard debian/$(package).debconf-hack),$(package)))
-dh_compat_5 := $(shell if [ '$(DH_COMPAT)' -ge 5 ]; then echo y; fi)
+dh_compat_6 := $(shell if [ '$(DH_COMPAT)' -ge 6 ]; then echo y; fi)
$(patsubst %,debian-debconf-hack/%,$(DEB_DEBCONF_HACK_PACKAGES)) :: debian-debconf-hack/%:
set -e; \
@@ -50,7 +50,7 @@
} >> $(CURDIR)/debian/$(cdbs_curpkg).postinst.debhelper
set -e; \
{ \
- $(if $(dh_compat_5),, \
+ $(if $(dh_compat_6),, \
if [ -e $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper ]; then \
cat $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper; \
fi;) \
@@ -59,7 +59,7 @@
echo ' debconf_set </var/cache/$(cdbs_curpkg).debconf-save'; \
echo ' rm -f /var/cache/$(cdbs_curpkg).debconf-save'; \
echo 'fi'; \
- $(if $(dh_compat_5), \
+ $(if $(dh_compat_6), \
if [ -e $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper ]; then \
cat $(CURDIR)/debian/$(cdbs_curpkg).postrm.debhelper; \
fi;) \
Modified: trunk/debathena/debathena/config-package-dev/debian/changelog
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/changelog 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/debian/changelog 2012-12-07 16:06:01 UTC (rev 25800)
@@ -1,3 +1,25 @@
+config-package-dev (4.14) unstable; urgency=low
+
+ [ Anders Kaseorg ]
+ * Reverse prerm and postrm maintainer script fragments when DH_COMPAT ≥
+ 6, not 5, to actually match debhelper’s behavior.
+
+ [ Geoffrey Thomas ]
+ * Update debathena-transform-example-1.0 to an example more likely to
+ work on modern systems.
+ * Fix a bug that would erroneously remove DEB_TRANSFORM_EXTENSION from
+ an explicitly-specified DEB_TRANSFORM_FILES_SOURCE.
+ * Fix some typos and misleading documentation. In particular, fix
+ build-dependencies and runtime dependencies of the examples.
+ * Remove an unnecessary parameter passed to undivert_unlink_divert in
+ divert.sh (Debathena: #1061).
+ * Undivert when a package is unconfigured, in addition to when it is
+ removed (partially addresses Debathena #388).
+ * Add self to uploaders, and change maintainer to the Debathena
+ project mailing list.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Tue, 25 Sep 2012 13:24:06 -0400
+
config-package-dev (4.13) unstable; urgency=low
* Fix DEB_CHECK_FILES and DEB_TRANSFORM_FILES with non-conffiles in
Modified: trunk/debathena/debathena/config-package-dev/debian/control
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/control 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/debian/control 2012-12-07 16:06:01 UTC (rev 25800)
@@ -1,13 +1,13 @@
Source: config-package-dev
Section: devel
Priority: extra
-Maintainer: Tim Abbott <tabbott@mit.edu>
-Uploaders: Anders Kaseorg <andersk@mit.edu>
+Maintainer: Debathena Project <debathena@mit.edu>
+Uploaders: Tim Abbott <tabbott@mit.edu>, Anders Kaseorg <andersk@mit.edu>, Geoffrey Thomas <geofft@mit.edu>
Homepage: http://debathena.mit.edu/config-package-dev
Vcs-Git: git://andersk.mit.edu/config-package-dev.git
Vcs-Browser: http://andersk.mit.edu/gitweb/config-package-dev.git
Build-Depends: cdbs,
- debhelper (>= 6),
+ debhelper,
dh-buildinfo
Standards-Version: 3.9.2
Modified: trunk/debathena/debathena/config-package-dev/debian/control.in
===================================================================
--- trunk/debathena/debathena/config-package-dev/debian/control.in 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/debian/control.in 2012-12-07 16:06:01 UTC (rev 25800)
@@ -1,8 +1,8 @@
Source: config-package-dev
Section: devel
Priority: extra
-Maintainer: Tim Abbott <tabbott@mit.edu>
-Uploaders: Anders Kaseorg <andersk@mit.edu>
+Maintainer: Debathena Project <debathena@mit.edu>
+Uploaders: Tim Abbott <tabbott@mit.edu>, Anders Kaseorg <andersk@mit.edu>, Geoffrey Thomas <geofft@mit.edu>
Homepage: http://debathena.mit.edu/config-package-dev
Vcs-Git: git://andersk.mit.edu/config-package-dev.git
Vcs-Browser: http://andersk.mit.edu/gitweb/config-package-dev.git
Modified: trunk/debathena/debathena/config-package-dev/divert.mk
===================================================================
--- trunk/debathena/debathena/config-package-dev/divert.mk 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/divert.mk 2012-12-07 16:06:01 UTC (rev 25800)
@@ -21,7 +21,9 @@
# config-package.mk.
# divert.mk handles the low-level diversion logic. It includes
-# divert.sh.in in the postinst and prerm scripts, and adds
+# divert.sh.in in the postinst and prerm scripts, and adds calls to the
+# functions in divert.sh.in to add and remove diversions and symlinks at
+# the appropriate points.
ifndef _cdbs_rules_divert
_cdbs_rules_divert = 1
@@ -53,14 +55,14 @@
# foo.divert.divert-orig
divert_files_replace_name = $(shell echo $(1) | perl -pe 's/(.*)\Q$(DEB_DIVERT_EXTENSION)\E/$$1$(2)/')
-# Transform a full path into the path it should be diverted to if it's
+# Encode a full path into the path it should be diverted to if it's
# removed
remove_files_name = /usr/share/$(cdbs_curpkg)/$(shell $(DEB_DIVERT_ENCODER) $(1))
-dh_compat_5 := $(shell if [ '$(DH_COMPAT)' -ge 5 ]; then echo y; fi)
+dh_compat_6 := $(shell if [ '$(DH_COMPAT)' -ge 6 ]; then echo y; fi)
reverse = $(foreach n,$(shell seq $(words $(1)) -1 1),$(word $(n),$(1)))
-reverse_dh_compat_5 = $(if $(dh_compat_5),$(call reverse,$(1)),$(1))
+reverse_dh_compat_6 = $(if $(dh_compat_6),$(call reverse,$(1)),$(1))
debian-divert/%: package = $(subst debian-divert/,,$@)
debian-divert/%: divert_files = $(DEB_DIVERT_FILES_$(package)) $(DEB_TRANSFORM_FILES_$(package))
@@ -93,20 +95,20 @@
# Add code to prerm script to undo diversions when package is removed.
set -e; \
{ \
- $(if $(dh_compat_5),, \
+ $(if $(dh_compat_6),, \
if [ -e $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper ]; then \
cat $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper; \
fi;) \
sed 's/#PACKAGE#/$(cdbs_curpkg)/g; s/#DEB_DIVERT_EXTENSION#/$(DEB_DIVERT_EXTENSION)/g' $(DEB_DIVERT_SCRIPT); \
$(if $(divert_files_thispkg), \
- echo 'if [ "$$1" = "remove" ]; then'; \
- $(foreach file,$(call reverse_dh_compat_5,$(divert_files)), \
+ echo 'if [ "$$1" = "remove" ] || [ "$$1" = "deconfigure" ]; then'; \
+ $(foreach file,$(call reverse_dh_compat_6,$(divert_files)), \
echo " undivert_unlink $(call divert_files_replace_name,$(file), )";) \
- $(foreach file,$(call reverse_dh_compat_5,$(divert_remove_files)), \
+ $(foreach file,$(call reverse_dh_compat_6,$(divert_remove_files)), \
echo " undivert_unremove $(file) $(cdbs_curpkg)";) \
echo 'fi'; \
) \
- $(if $(dh_compat_5), \
+ $(if $(dh_compat_6), \
if [ -e $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper ]; then \
cat $(CURDIR)/debian/$(cdbs_curpkg).prerm.debhelper; \
fi;) \
@@ -117,8 +119,8 @@
# and Conflicts: lists. This prevents two packages diverting the same
# file from being installed simultaneously (it cannot work, and this
# produces a much less ugly error). Requires in debian/control:
-# Provides: $(diverted-files)
-# Conflicts: $(diverted-files)
+# Provides: ${diverted-files}
+# Conflicts: ${diverted-files}
set -e; \
{ \
echo -n "diverted-files="; \
Modified: trunk/debathena/debathena/config-package-dev/divert.sh.in
===================================================================
--- trunk/debathena/debathena/config-package-dev/divert.sh.in 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/divert.sh.in 2012-12-07 16:06:01 UTC (rev 25800)
@@ -98,7 +98,7 @@
theirfile=$prefix$theirs$suffix
undivert_unlink_symlink "$file" "$ourfile" "$theirfile"
- undivert_unlink_divert "$file" "$package"
+ undivert_unlink_divert "$file"
}
undivert_unremove()
Modified: trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.0/debian/control
===================================================================
--- trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.0/debian/control 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.0/debian/control 2012-12-07 16:06:01 UTC (rev 25800)
@@ -2,13 +2,16 @@
Section: config
Priority: extra
Maintainer: Tim Abbott <tabbott@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev (>= 4.5~)
+Build-Depends: cdbs,
+ debhelper,
+ dh-buildinfo,
+ config-package-dev (>= 4.5~)
Standards-Version: 3.8.0
Package: debathena-bin-example
Architecture: all
-Depends: cdbs, ${misc:Depends}, elinks
+Depends: ${misc:Depends}, elinks, less
Provides: ${diverted-files}
Conflicts: ${diverted-files}
-Description: Example config-packag-dev package
+Description: Example config-package-dev package
This is an example config-package-dev package.
Modified: trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.0/debian/control.in
===================================================================
--- trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.0/debian/control.in 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.0/debian/control.in 2012-12-07 16:06:01 UTC (rev 25800)
@@ -7,8 +7,8 @@
Package: debathena-bin-example
Architecture: all
-Depends: cdbs, ${misc:Depends}, elinks
+Depends: ${misc:Depends}, elinks, less
Provides: ${diverted-files}
Conflicts: ${diverted-files}
-Description: Example config-packag-dev package
+Description: Example config-package-dev package
This is an example config-package-dev package.
Modified: trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.1/debian/control
===================================================================
--- trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.1/debian/control 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.1/debian/control 2012-12-07 16:06:01 UTC (rev 25800)
@@ -2,13 +2,16 @@
Section: config
Priority: extra
Maintainer: Tim Abbott <tabbott@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev (>= 4.5~)
+Build-Depends: cdbs,
+ debhelper,
+ dh-buildinfo,
+ config-package-dev (>= 4.5~)
Standards-Version: 3.8.0
Package: debathena-bin-example
Architecture: all
-Depends: cdbs, ${misc:Depends}, elinks
+Depends: ${misc:Depends}, less
Provides: ${diverted-files}
Conflicts: ${diverted-files}
-Description: Example config-packag-dev package
+Description: Example config-package-dev package
This is an example config-package-dev package.
Modified: trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.1/debian/control.in
===================================================================
--- trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.1/debian/control.in 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/examples/debathena-bin-example-1.1/debian/control.in 2012-12-07 16:06:01 UTC (rev 25800)
@@ -7,8 +7,8 @@
Package: debathena-bin-example
Architecture: all
-Depends: cdbs, ${misc:Depends}, elinks
+Depends: ${misc:Depends}, less
Provides: ${diverted-files}
Conflicts: ${diverted-files}
-Description: Example config-packag-dev package
+Description: Example config-package-dev package
This is an example config-package-dev package.
Modified: trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/control
===================================================================
--- trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/control 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/control 2012-12-07 16:06:01 UTC (rev 25800)
@@ -2,13 +2,16 @@
Section: config
Priority: extra
Maintainer: Tim Abbott <tabbott@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev (>= 4.5~)
+Build-Depends: cdbs,
+ debhelper,
+ dh-buildinfo,
+ config-package-dev (>= 4.5~)
Standards-Version: 3.8.0
Package: debathena-conffile-example
Architecture: all
-Depends: cdbs, ${misc:Depends}
+Depends: ${misc:Depends}
Provides: ${diverted-files}
Conflicts: ${diverted-files}
-Description: Example config-packag-dev package
+Description: Example config-package-dev package
This is an example config-package-dev package.
Modified: trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/control.in
===================================================================
--- trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/control.in 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/control.in 2012-12-07 16:06:01 UTC (rev 25800)
@@ -7,8 +7,8 @@
Package: debathena-conffile-example
Architecture: all
-Depends: cdbs, ${misc:Depends}
+Depends: ${misc:Depends}
Provides: ${diverted-files}
Conflicts: ${diverted-files}
-Description: Example config-packag-dev package
+Description: Example config-package-dev package
This is an example config-package-dev package.
Modified: trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/rules
===================================================================
--- trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/rules 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/examples/debathena-conffile-example-1.0/debian/rules 2012-12-07 16:06:01 UTC (rev 25800)
@@ -3,9 +3,7 @@
DEB_DIVERT_EXTENSION = .debathena
# Replace some base files with simple replacements.
DEB_DIVERT_FILES_debathena-conffile-example += \
- /etc/issue.net.debathena \
- /etc/mailname.debathena \
- /etc/papersize.debathena
+ /etc/issue.net.debathena
# These files are installed via dh_install from the files/ directory
# (see debian/debathena-conffile-example.install)
Modified: trunk/debathena/debathena/config-package-dev/examples/debathena-cron-example-1.0/debian/control
===================================================================
--- trunk/debathena/debathena/config-package-dev/examples/debathena-cron-example-1.0/debian/control 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/examples/debathena-cron-example-1.0/debian/control 2012-12-07 16:06:01 UTC (rev 25800)
@@ -2,13 +2,16 @@
Section: config
Priority: extra
Maintainer: Tim Abbott <tabbott@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev (>= 4.5~)
+Build-Depends: cdbs,
+ debhelper,
+ dh-buildinfo,
+ config-package-dev (>= 4.5~)
Standards-Version: 3.8.0
Package: debathena-cron-example
Architecture: all
-Depends: cdbs, ${misc:Depends}, logcheck
+Depends: ${misc:Depends}, logcheck
Provides: ${diverted-files}
Conflicts: ${diverted-files}
-Description: Example config-packag-dev package
+Description: Example config-package-dev package
This is an example config-package-dev package.
Modified: trunk/debathena/debathena/config-package-dev/examples/debathena-cron-example-1.0/debian/control.in
===================================================================
--- trunk/debathena/debathena/config-package-dev/examples/debathena-cron-example-1.0/debian/control.in 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/examples/debathena-cron-example-1.0/debian/control.in 2012-12-07 16:06:01 UTC (rev 25800)
@@ -7,8 +7,8 @@
Package: debathena-cron-example
Architecture: all
-Depends: cdbs, ${misc:Depends}, logcheck
+Depends: ${misc:Depends}, logcheck
Provides: ${diverted-files}
Conflicts: ${diverted-files}
-Description: Example config-packag-dev package
+Description: Example config-package-dev package
This is an example config-package-dev package.
Modified: trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/control
===================================================================
--- trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/control 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/control 2012-12-07 16:06:01 UTC (rev 25800)
@@ -2,13 +2,16 @@
Section: config
Priority: extra
Maintainer: Tim Abbott <tabbott@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev (>= 4.5~)
+Build-Depends: cdbs,
+ debhelper,
+ dh-buildinfo,
+ config-package-dev (>= 4.5~), lynx
Standards-Version: 3.8.0
Package: debathena-transform-example
Architecture: all
-Depends: cdbs, ${misc:Depends}, elinks
+Depends: ${misc:Depends}, lynx
Provides: ${diverted-files}
Conflicts: ${diverted-files}
-Description: Example config-packag-dev package
+Description: Example config-package-dev package
This is an example config-package-dev package.
Modified: trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/control.in
===================================================================
--- trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/control.in 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/control.in 2012-12-07 16:06:01 UTC (rev 25800)
@@ -2,13 +2,13 @@
Section: config
Priority: extra
Maintainer: Tim Abbott <tabbott@mit.edu>
-Build-Depends: @cdbs@
+Build-Depends: @cdbs@, lynx
Standards-Version: 3.8.0
Package: debathena-transform-example
Architecture: all
-Depends: cdbs, ${misc:Depends}, elinks
+Depends: ${misc:Depends}, lynx
Provides: ${diverted-files}
Conflicts: ${diverted-files}
-Description: Example config-packag-dev package
+Description: Example config-package-dev package
This is an example config-package-dev package.
Modified: trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/rules
===================================================================
--- trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/rules 2012-12-06 09:55:08 UTC (rev 25799)
+++ trunk/debathena/debathena/config-package-dev/examples/debathena-transform-example-1.0/debian/rules 2012-12-07 16:06:01 UTC (rev 25800)
@@ -2,7 +2,7 @@
DEB_DIVERT_EXTENSION = .debathena
DEB_TRANSFORM_FILES_debathena-transform-example += \
- /etc/syslog.conf.debathena
+ /etc/lynx-cur/lynx.cfg.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
