[Pkg-irc-commits] r265 - in /packages/inspircd12/trunk/debian: changelog patches/01_destdir_package patches/01_fix_root patches/series

[asciitxt-guest at users.alioth.debian.org]

Author: asciitxt-guest
Date: Wed Jul 14 23:04:49 2010
New Revision: 265

URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=265
Log:
disable upstream check-root target, drop merged patch

Added:
    packages/inspircd12/trunk/debian/patches/01_fix_root
Removed:
    packages/inspircd12/trunk/debian/patches/01_destdir_package
Modified:
    packages/inspircd12/trunk/debian/changelog
    packages/inspircd12/trunk/debian/patches/series

Modified: packages/inspircd12/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/changelog?rev=265&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/changelog (original)
+++ packages/inspircd12/trunk/debian/changelog Wed Jul 14 23:04:49 2010
@@ -38,8 +38,11 @@
 
   [ Matt Arnold ]
   * New upstream release while this was in progress
+  * debian/patches:
+  	+ Drop 01_destdir_package upstream merge
+  	+ Add 01_fix_root (disables upstream check-root target for buildd) 
 
- -- Matt Arnold <mattarnold5 at gmail.com>  Wed, 14 Jul 2010 14:54:50 -0400
+ -- Matt Arnold <mattarnold5 at gmail.com>  Wed, 14 Jul 2010 19:00:07 -0400
 
 inspircd (1.2.4-1) UNRELEASED; urgency=low
 

Added: packages/inspircd12/trunk/debian/patches/01_fix_root
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/patches/01_fix_root?rev=265&op=file
==============================================================================
--- packages/inspircd12/trunk/debian/patches/01_fix_root (added)
+++ packages/inspircd12/trunk/debian/patches/01_fix_root Wed Jul 14 23:04:49 2010
@@ -1,0 +1,13 @@
+Index: inspircd-1.2.7+dfsg/.Makefile.inc
+===================================================================
+--- inspircd-1.2.7+dfsg.orig/.Makefile.inc	2010-07-14 18:55:38.000000000 -0400
++++ inspircd-1.2.7+dfsg/.Makefile.inc	2010-07-14 18:55:55.000000000 -0400
+@@ -52,8 +52,6 @@
+ debug:
+ 	@${MAKE} D=1 all
+ 
+-check-root:
+-	@if [ `id -u` = 0 ] && [ ! -e .force-root-ok ]; then echo "Don't compile or install as root!"; exit 1; fi
+ 
+ debug-header: check-root
+ 	@echo "*************************************"

Modified: packages/inspircd12/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd12/trunk/debian/patches/series?rev=265&op=diff
==============================================================================
--- packages/inspircd12/trunk/debian/patches/series (original)
+++ packages/inspircd12/trunk/debian/patches/series Wed Jul 14 23:04:49 2010
@@ -1,3 +1,3 @@
-01_destdir_package
+01_fix_root
 02_spelling_error_in_binary
 03_disable_rpath_for_extra_modules