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

Please upload boxshade 3.3.1-2, which fixes a wishlist bug.



Dear all,

I have prepared a revised version of boxshade source package, which now
allows to build unstripped binaries.

I uploaded it on mentors.d.o, it is also the latest SVN revision of our
repository.

http://mentors.debian.net/debian/pool/main/b/boxshade/
http://svn.debian.org/wsvn/debian-med/trunk/packages/boxshade/trunk/

Attached to that mail are explanations about the differences introduced
in this package. Upstream version did not change.

Have a nice day,

-- 
Charles Plessy
http://charles.plessy.org
Wako, Saitama, Japan
 boxshade-3.3.1/debian/changelog      |   11 +++++++++++
 boxshade-3.3.1/debian/control        |    2 +-
 boxshade-3.3.1/debian/menu           |    2 +-
 boxshade-3.3.1/debian/rules          |   23 ++++++++++-------------
 debian/patches/10_makefile.unx.patch |   22 ++++++++++++++++++++++
 debian/patches/series                |    1 +
 makefile.unx                         |    5 -----
 7 files changed, 46 insertions(+), 20 deletions(-)
diff -u boxshade-3.3.1/debian/changelog boxshade-3.3.1/debian/changelog
--- boxshade-3.3.1/debian/changelog
+++ boxshade-3.3.1/debian/changelog
@@ -1,3 +1,14 @@
+boxshade (3.3.1-2) unstable; urgency=low
+
+  * Debian Menu transition: Apps/Science becomes Applications/Science/Biology.
+  * makefile.unx : changes managed using the `quilt' patch system.
+  * makefile.unx : commenting `LDFLAGS= -s' so that stripping is handled by
+    dh_strip (Closes: #436605).
+  * debian/rules : `ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))' test
+    removed because dh_strip can work without.
+
+ -- Charles Plessy <charles-debian-nospam@plessy.org>  Thu,  9 Aug 2007 10:38:31 +0900
+
 boxshade (3.3.1-1) unstable; urgency=low
 
   [ Steffen Moeller ]
diff -u boxshade-3.3.1/debian/control boxshade-3.3.1/debian/control
--- boxshade-3.3.1/debian/control
+++ boxshade-3.3.1/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian-Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
 Uploaders: Steffen Moeller <steffen_moeller@gmx.de>, Charles Plessy <charles-debian-nospam@plessy.org>
-Build-Depends: debhelper (>= 5), xsltproc, docbook-xsl, docbook-xml
+Build-Depends: debhelper (>= 5), quilt, xsltproc, docbook-xsl, docbook-xml
 Standards-Version: 3.7.2
 XS-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/boxshade/trunk/
 XS-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/boxshade
diff -u boxshade-3.3.1/debian/menu boxshade-3.3.1/debian/menu
--- boxshade-3.3.1/debian/menu
+++ boxshade-3.3.1/debian/menu
@@ -1,6 +1,6 @@
 ?package(boxshade):\
   needs="text"\
-  section="Apps/Science"\
+  section="Applications/Science/Biology"\
   title="Boxshade"\
   command="/usr/bin/boxshade"
 
diff -u boxshade-3.3.1/debian/rules boxshade-3.3.1/debian/rules
--- boxshade-3.3.1/debian/rules
+++ boxshade-3.3.1/debian/rules
@@ -10,34 +10,31 @@
 else
 	CFLAGS += -O2
 endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
 
-build: build-stamp
+include /usr/share/quilt/quilt.make
 
 XP=xsltproc  \
-      -''-nonet \
-      -''-param man.charmap.use.subset "0" \
-      -''-param make.year.ranges "1" \
-      -''-param make.single.year.ranges "1" 
+      --nonet \
+      --param man.charmap.use.subset "0" \
+      --param make.year.ranges "1" \
+      --param make.single.year.ranges "1" 
 
 
 boxshade.1:	debian/boxshade.1.xml
 	$(XP) $<
 
-
-build-stamp: boxshade.1
+build: patch build-stamp boxshade.1
+build-stamp:
 	dh_testdir
 	$(MAKE) -f makefile.unx
 	touch build-stamp
 
-clean:
+clean: clean-patched unpatch
+clean-patched: patch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-$(MAKE) -f makefile.unx clean
+	$(MAKE) -f makefile.unx clean
 	dh_clean boxshade.1
 
 install: build
reverted:
--- boxshade-3.3.1/makefile.unx
+++ boxshade-3.3.1.orig/makefile.unx
@@ -40,8 +40,3 @@
 dv_ps$(OBJ):    dv_ps.c    bx_types.h bx_read.h dv_all.h version.h
 dv_regis$(OBJ): dv_regis.c bx_types.h bx_read.h dv_all.h
 dv_rtf$(OBJ):   dv_rtf.c   bx_types.h bx_read.h dv_all.h
-
-.PHONY: clean
-
-clean:
-	rm -f $(OBJS) boxshade$(EXE)
only in patch2:
unchanged:
--- boxshade-3.3.1.orig/debian/patches/series
+++ boxshade-3.3.1/debian/patches/series
@@ -0,0 +1 @@
+10_makefile.unx.patch
only in patch2:
unchanged:
--- boxshade-3.3.1.orig/debian/patches/10_makefile.unx.patch
+++ boxshade-3.3.1/debian/patches/10_makefile.unx.patch
@@ -0,0 +1,22 @@
+Index: trunk/makefile.unx
+===================================================================
+--- trunk.orig/makefile.unx
++++ trunk/makefile.unx
+@@ -1,7 +1,7 @@
+ # BOXSHADE makefile for unix (tested under Linux && Solaris)
+ CC     = gcc
+ CFLAGS = -O
+-LDFLAGS= -s
++# dh_strip takes care of this... LDFLAGS= -s
+ LIBS   = -lm
+ OBJ    =.o
+ EXE    =
+@@ -40,3 +40,8 @@
+ dv_ps$(OBJ):    dv_ps.c    bx_types.h bx_read.h dv_all.h version.h
+ dv_regis$(OBJ): dv_regis.c bx_types.h bx_read.h dv_all.h
+ dv_rtf$(OBJ):   dv_rtf.c   bx_types.h bx_read.h dv_all.h
++
++.PHONY: clean
++
++clean:
++	rm -f $(OBJS) boxshade$(EXE)

Reply to: