[debian-edu-commits] debian-edu/ 01/03: Undo fix from Holger to clean up my failure to push the 1.812 in time.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-install.

commit 65d2e71c017b17c48dd123d9c0dce0651a2ecd36
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Oct 19 14:26:03 2014 +0200

    Undo fix from Holger to clean up my failure to push the 1.812 in time.
---
 debian/changelog | 5 -----
 debian/rules     | 1 -
 2 files changed, 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 310f0af..174899d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 debian-edu-install (1.812) UNRELEASED; urgency=low
 
-  [ Petter Reinholdtsen ]
   * Enable the quick installation now that bug #759590 in eatmydata is
     fixed in testing.
   * Rewrite code in firstboot script to detect a working X frontend
@@ -13,10 +12,6 @@ debian-edu-install (1.812) UNRELEASED; urgency=low
   * Change firstboot script to avoid checking for a working X
     authority file twice when restarted by debconf.
 
-  [ Holger Levsen ]
-  * Install /usr/lib/debian-edu-install/version in the debian-edu-profile-udeb
-    too.
-
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 16 Oct 2014 14:37:51 +0200
 
 debian-edu-install (1.811) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index d1ec976..627c4ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,6 @@ override_dh_auto_install:
 	cp pre-pkgsel $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/pre-pkgsel.d/10debian-edu-profile-udeb
 	cp finish-install $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/finish-install.d/13debian-edu-profile-udeb
 	cp apt-setup/generators/70debian-edu-install $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/apt-setup/generators/70debian-edu-install
-	cp version $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/debian-edu-install/
 	for profile in $(DEFAULTS) ; do \
 	    cp preseed-values/defaults.$$profile $(CURDIR)/debian/debian-edu-profile-udeb/usr/lib/debian-edu-install ; \
 	done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git