[27197] in Source-Commits
/svn/athena r26008 - in trunk/debathena/config/reactivate: . debian
daemon@ATHENA.MIT.EDU (Alexander Chernyakhovsky)
Thu May 30 02:58:16 2013
Date: Thu, 30 May 2013 02:58:09 -0400
From: Alexander Chernyakhovsky <achernya@MIT.EDU>
Message-Id: <201305300658.r4U6w9Uv008470@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: achernya
Date: 2013-05-30 02:58:09 -0400 (Thu, 30 May 2013)
New Revision: 26008
Added:
trunk/debathena/config/reactivate/debian/debathena-reactivate.displace
trunk/debathena/config/reactivate/debian/debathena-reactivate.hide
trunk/debathena/config/reactivate/debian/debathena-reactivate.transform
Modified:
trunk/debathena/config/reactivate/Makefile
trunk/debathena/config/reactivate/debian/changelog
trunk/debathena/config/reactivate/debian/control
trunk/debathena/config/reactivate/debian/rules
Log:
In reactivate:
* Convert to dh7
Modified: trunk/debathena/config/reactivate/Makefile
===================================================================
--- trunk/debathena/config/reactivate/Makefile 2013-05-30 06:24:08 UTC (rev 26007)
+++ trunk/debathena/config/reactivate/Makefile 2013-05-30 06:58:09 UTC (rev 26008)
@@ -1,13 +1,17 @@
-all: session-wrapper
+all: session-wrapper command-not-found.mo
session-wrapper: session-wrapper.c
$(CC) -o session-wrapper session-wrapper.c
+command-not-found.mo:
+ msgfmt -o command-not-found.mo command-not-found.po
+
install: all
install -d $(DESTDIR)/usr/lib/debathena-reactivate
install -m4755 session-wrapper $(DESTDIR)/usr/lib/debathena-reactivate
clean:
rm -f session-wrapper
+ rm -f command-not-found.mo
.PHONY: clean all
Modified: trunk/debathena/config/reactivate/debian/changelog
===================================================================
--- trunk/debathena/config/reactivate/debian/changelog 2013-05-30 06:24:08 UTC (rev 26007)
+++ trunk/debathena/config/reactivate/debian/changelog 2013-05-30 06:58:09 UTC (rev 26008)
@@ -1,4 +1,4 @@
-debathena-reactivate (2.0.43) UNRELEASED; urgency=low
+debathena-reactivate (2.0.43) unstable; urgency=low
[ Jonathan Reed ]
* Switch from control.in to control (Trac: #561)
@@ -7,6 +7,7 @@
[ Alexander Chernyakhovsky ]
* Switch from debathena-gettime to rdate
+ * Convert to dh7
-- Jonathan Reed <jdreed@mit.edu> Sat, 11 May 2013 18:10:16 -0400
Modified: trunk/debathena/config/reactivate/debian/control
===================================================================
--- trunk/debathena/config/reactivate/debian/control 2013-05-30 06:24:08 UTC (rev 26007)
+++ trunk/debathena/config/reactivate/debian/control 2013-05-30 06:58:09 UTC (rev 26008)
@@ -2,7 +2,7 @@
Section: debathena/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo, config-package-dev (>= 5.0~), sudo, schroot, dbus, gettext
+Build-Depends: debhelper (>= 7.0.50~), config-package-dev (>= 5.0~), sudo, schroot, dbus, gettext
Standards-Version: 3.9.3
Package: debathena-reactivate
Added: trunk/debathena/config/reactivate/debian/debathena-reactivate.displace
===================================================================
--- trunk/debathena/config/reactivate/debian/debathena-reactivate.displace (rev 0)
+++ trunk/debathena/config/reactivate/debian/debathena-reactivate.displace 2013-05-30 06:58:09 UTC (rev 26008)
@@ -0,0 +1,2 @@
+/etc/gdm/Xsession.debathena
+/usr/sbin/lightdm-session.debathena
Added: trunk/debathena/config/reactivate/debian/debathena-reactivate.hide
===================================================================
--- trunk/debathena/config/reactivate/debian/debathena-reactivate.hide (rev 0)
+++ trunk/debathena/config/reactivate/debian/debathena-reactivate.hide 2013-05-30 06:58:09 UTC (rev 26008)
@@ -0,0 +1,3 @@
+/etc/xdg/autostart/jockey-gtk.desktop
+/etc/xdg/autostart/update-notifier.desktop
+/etc/xdg/autostart/nm-applet.desktop
Added: trunk/debathena/config/reactivate/debian/debathena-reactivate.transform
===================================================================
--- trunk/debathena/config/reactivate/debian/debathena-reactivate.transform (rev 0)
+++ trunk/debathena/config/reactivate/debian/debathena-reactivate.transform 2013-05-30 06:58:09 UTC (rev 26008)
@@ -0,0 +1,4 @@
+/etc/default/schroot.debathena debian/transform_schroot_defaults
+/etc/pam.d/schroot.debathena debian/transform_schroot_pam
+/etc/pam.d/su.debathena debian/transform_su
+/etc/dbus-1/system.conf.debathena debian/transform_system.conf.debathena
Modified: trunk/debathena/config/reactivate/debian/rules
===================================================================
--- trunk/debathena/config/reactivate/debian/rules 2013-05-30 06:24:08 UTC (rev 26007)
+++ trunk/debathena/config/reactivate/debian/rules 2013-05-30 06:58:09 UTC (rev 26008)
@@ -1,39 +1,7 @@
#!/usr/bin/make -f
-DEB_DIVERT_EXTENSION = .debathena
-DEB_DIVERT_FILES_debathena-reactivate += \
- /etc/gdm/Xsession.debathena \
- /usr/sbin/lightdm-session.debathena
-DEB_TRANSFORM_FILES_debathena-reactivate += \
- /etc/pam.d/su.debathena \
- /etc/default/schroot.debathena \
- /etc/pam.d/schroot.debathena \
- /etc/dbus-1/system.conf.debathena
-DEB_REMOVE_FILES_debathena-reactivate += \
- /etc/xdg/autostart/jockey-gtk.desktop \
- /etc/xdg/autostart/update-notifier.desktop \
- /etc/xdg/autostart/nm-applet.desktop
+%:
+ dh $@ --with config-package
-DEB_UNDIVERT_FILES_debathena-reactivate += \
- /etc/pam.d/sudo.debathena
-DEB_UNDIVERT_VERSION_/etc/pam.d/sudo.debathena = 1.25.2~
-
-DEB_TRANSFORM_SCRIPT_/etc/default/schroot.debathena = \
- debian/transform_schroot_defaults
-DEB_TRANSFORM_SCRIPT_/etc/pam.d/schroot.debathena = \
- debian/transform_schroot_pam
-
-# The wrapper does in fact need to be setuid
-DEB_DH_FIXPERMS_ARGS = -X/usr/lib/debathena-reactivate/session-wrapper
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/config-package.mk
-
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR)
-
-build/debathena-reactivate::
- msgfmt -o command-not-found.mo command-not-found.po
-
-clean::
- rm -f command-not-found.mo
+override_dh_fixperms:
+ dh_fixperms -X/usr/lib/debathena-reactivate/session-wrapper
