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

Bug#392402: Patch for NMU to fix this bug



tag 392402 patch
thanks

Attached is the patch for the NMU to fix this bug.


Don Armstrong

-- 
"There are two major products that come out of Berkeley: LSD and UNIX.
We don't believe this to be a coincidence."
 -- Jeremy S. Anderson

http://www.donarmstrong.com              http://rzlab.ucr.edu
diff -u sufary-2.1.1/debian/changelog sufary-2.1.1/debian/changelog
--- sufary-2.1.1/debian/changelog
+++ sufary-2.1.1/debian/changelog
@@ -1,3 +1,10 @@
+sufary (2.1.1-7.1) unstable; urgency=low
+
+  * NMU Upload
+  * Stop shipping architecture dependent files in /usr/share (Closes: #392402)
+
+ -- Don Armstrong <don@debian.org>  Wed, 11 Oct 2006 12:39:05 -0700
+
 sufary (2.1.1-7) unstable; urgency=medium
 
   * QA upload.
diff -u sufary-2.1.1/debian/rules sufary-2.1.1/debian/rules
--- sufary-2.1.1/debian/rules
+++ sufary-2.1.1/debian/rules
@@ -11,13 +11,17 @@
 PERL = /usr/bin/perl
 endif
 TMPDIR     =$(CURDIR)/debian/sufary
-archlib =`$(PERL) -MConfig -e 'print $$Config{installarchlib}'`
-config  =INSTALLMAN1DIR=$(TMPDIR)/usr/share/man/man1 INSTALLMAN3DIR=$(TMPDIR)/usr/share/man/man3 INSTALLPRIVLIB=$(TMPDIR)/usr/lib/perl5 INSTALLARCHLIB=$(TMPDIR)$(archlib)
+#archlib =`$(PERL) -MConfig -e 'print $$Config{installarchlib}'`
+#config  =INSTALLMAN1DIR=$(TMPDIR)/usr/share/man/man1 INSTALLMAN3DIR=$(TMPDIR)/usr/share/man/man3 INSTALLPRIVLIB=$(TMPDIR)/usr/lib/perl5 INSTALLARCHLIB=$(TMPDIR)$(archlib)
 
 build: build-stamp
 build-stamp:
 	dh_testdir
 
+
+	# First we have to delete some perl detrius that is in the orig.tar.gz
+	rm -f perl/{SUFARY,DID}/Makefile.static.PL perl/DID/Makefile{,old} \
+		perl/SUFARY/Makefile.old
 	# Add here commands to compile the package.
 	sed -e 's/$$(OUTPUT_OPTION)//' lib/Makefile >lib/Makefile.new
 	mv -f lib/Makefile.new lib/Makefile
@@ -45,10 +49,10 @@
 	$(CC) -O -lm -o af af.o libsufary.so.2)
 
 	(cd perl/SUFARY &&\
-	$(PERL) ./Makefile.PL $(config) &&\
+	$(PERL) ./Makefile.PL INSTALLDIRS=vendor &&\
 	$(MAKE) OBJECT=SUFARY.o LD_RUN_PATH="")
 	(cd perl/DID &&\
-	$(PERL) ./Makefile.PL $(config) &&\
+	$(PERL) ./Makefile.PL INSTALLDIRS=vendor &&\
 	$(MAKE) LD_RUN_PATH="")
 
 	touch build-stamp
@@ -111,14 +115,11 @@
 	>debian/sufary-dev/usr/share/doc/sufary-dev/ReferenceC.txt
 
 	# libsufary-perl
-	$(MAKE) -C perl/SUFARY PREFIX=$(CURDIR)/debian/libsufary-perl/usr pure_perl_install
-	$(MAKE) -C perl/DID    PREFIX=$(CURDIR)/debian/libsufary-perl/usr pure_perl_install
+	$(MAKE) -C perl/SUFARY install PREFIX=$(CURDIR)/debian/libsufary-perl/usr
+	$(MAKE) -C perl/DID    install PREFIX=$(CURDIR)/debian/libsufary-perl/usr
 	perl doc/txt2txt.perl doc/ReferenceP.txt\
 	>debian/libsufary-perl/usr/share/doc/libsufary-perl/ReferenceP.txt
 	find debian/libsufary-perl -type f -name .packlist | xargs rm -f
-	mv debian/libsufary-perl/usr/lib/perl/5.* debian/libsufary-perl/usr/share/perl5
-	rm -r debian/libsufary-perl/usr/lib/perl debian/libsufary-perl/usr/share/perl
-
 
 	# sufary-tcltk
 	cp kwicview/fileselecter.tcl kwicview/tclIndex \
only in patch2:
unchanged:
--- sufary-2.1.1.orig/lib/Makefile
+++ sufary-2.1.1/lib/Makefile
@@ -38,6 +38,6 @@
 cls: clean
 
 .c.so:
-	$(CC) -fPIC $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -o $@ -c $< $(OUTPUT_OPTION)
+	$(CC) -fPIC $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -o $@ -c $< 
 
 

Reply to: