[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Patch: grep 2.5.1.ds2-6em2



Hi all,

I am a DD working for Google as an intern this summer, and part of my work there involves building (and fixing up) emdebian packages.  This is the first of hopefully a series of fixes that I will be contributing back to emdebian.

This patch fixes the problem where the emdebian grep 2.5.1.ds2-6em1 package builds successfully, but all the built packages are essentially empty.

--
Chuan-kai Lin
Index: emdebian-links.patch
===================================================================
--- emdebian-links.patch	(revision 0)
+++ emdebian-links.patch	(revision 0)
@@ -0,0 +1,4 @@
+--- grep.old/debian/links	Fri Jul 20 19:10:54 2007
++++ /home/cklin/build/trunk/g/grep/trunk/grep-2.5.1.ds2/debian/links	Fri Jul 20 19:10:54 2007
+@@ -1 +0,0 @@
+-usr/share/man/man1/grep.1.gz usr/share/man/man1/rgrep.1.gz
Index: emdebian-changelog.patch
===================================================================
--- emdebian-changelog.patch	(revision 1402)
+++ emdebian-changelog.patch	(working copy)
@@ -1,6 +1,13 @@
---- grep.old/debian/changelog	2007-03-27 19:29:42.000000000 +0100
-+++ /opt/emdebian/trunk/g/grep/trunk/grep-2.5.1.ds2/debian/changelog	2007-03-27 19:29:42.000000000 +0100
-@@ -1,3 +1,9 @@
+--- grep.old/debian/changelog	Fri Jul 20 19:10:54 2007
++++ /home/cklin/build/trunk/g/grep/trunk/grep-2.5.1.ds2/debian/changelog	Fri Jul 20 19:10:54 2007
+@@ -1,3 +1,16 @@
++grep (2.5.1.ds2-6em2) unstable; urgency=low
++
++  * New emdebian release.
++  * Install files into package directories after built.
++
++ -- Chuan-kai Lin <cklin@google.com>  Fri, 20 Jul 2007 12:03:46 -0700
++
 +grep (2.5.1.ds2-6em1) unstable; urgency=low
 +
 +  * New emdebian release.
Index: emdebian-rules.patch
===================================================================
--- emdebian-rules.patch	(revision 1402)
+++ emdebian-rules.patch	(working copy)
@@ -1,7 +1,9 @@
---- grep.old/debian/rules	2007-03-27 19:29:42.000000000 +0100
-+++ /opt/emdebian/trunk/g/grep/trunk/grep-2.5.1.ds2/debian/rules	2007-03-27 19:29:42.000000000 +0100
-@@ -1,12 +1,10 @@
+--- grep.old/debian/rules	Fri Jul 20 19:10:54 2007
++++ /home/cklin/build/trunk/g/grep/trunk/grep-2.5.1.ds2/debian/rules	Fri Jul 20 19:10:54 2007
+@@ -1,12 +1,26 @@
  #!/usr/bin/make -f
++# Copyright 2007 Google Inc.
++# Author: cklin@google.com  (Chuan-kai Lin)
  
  DEB_TAR_SRCDIR=grep-2.5.1
 -include /usr/share/cdbs/1/rules/debhelper.mk
@@ -14,3 +16,17 @@
 -#DEB_MAKE_CHECK_TARGET = check
  
  DEB_CONFIGURE_EXTRA_FLAGS := CFLAGS=-O3 --exec-prefix=/ --disable-perl-regexp
++
++common-binary-post-install-arch::
++	install -d $(CURDIR)/debian/grep
++	cp -a $(CURDIR)/debian/tmp/bin $(CURDIR)/debian/grep
++
++common-binary-post-install-indep::
++	cd $(CURDIR)/build-tree/$(DEB_TAR_SRCDIR)/po ; \
++	for GMOFILE in `ls *.gmo` ; do \
++	LCNAME=$${GMOFILE%%.gmo} ; \
++	LCname=`echo $$LCNAME | tr '_@A-Z' '-+a-z'` ; \
++	DEST=$(CURDIR)/debian/grep-locale-$$LCname/usr/share/locale ; \
++	install -d $$DEST ; \
++	cp -a $(CURDIR)/debian/tmp/usr/share/locale/$$LCNAME $$DEST ; \
++	done

Reply to: