[Restricted-changes] r170 - in dists/trunk/xv/debian: . bug lintian patches
fabian-guest at alioth.debian.org
fabian-guest at alioth.debian.org
Mon Feb 25 20:50:14 UTC 2008
Author: fabian-guest
Date: 2008-02-25 20:50:13 +0000 (Mon, 25 Feb 2008)
New Revision: 170
Added:
dists/trunk/xv/debian/bug/xv-utils
dists/trunk/xv/debian/lintian/xv-utils
dists/trunk/xv/debian/pixmap/
dists/trunk/xv/debian/pixmaps/
dists/trunk/xv/debian/xv-utils.install
Removed:
dists/trunk/xv/debian/patches/05-override-cflags.dpatch
dists/trunk/xv/debian/pixmap/
Modified:
dists/trunk/xv/debian/control
dists/trunk/xv/debian/patches/00list
dists/trunk/xv/debian/rules
dists/trunk/xv/debian/xv.install
Log:
Introduce xv-utils.
Added: dists/trunk/xv/debian/bug/xv-utils
===================================================================
--- dists/trunk/xv/debian/bug/xv-utils (rev 0)
+++ dists/trunk/xv/debian/bug/xv-utils 2008-02-25 20:50:13 UTC (rev 170)
@@ -0,0 +1 @@
+Send-To: Debian Restricted <restricted-devel at lists.alioth.debian.org>
Modified: dists/trunk/xv/debian/control
===================================================================
--- dists/trunk/xv/debian/control 2008-02-22 15:10:56 UTC (rev 169)
+++ dists/trunk/xv/debian/control 2008-02-25 20:50:13 UTC (rev 170)
@@ -6,7 +6,7 @@
Daniel Baumann <daniel at debian.org>
Origin: debian-unofficial.org
Bugs: mailto:restricted-devel at lists.alioth.debian.org
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5),
dpatch,
libjasper-dev,
@@ -26,7 +26,7 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Recommends: xv-doc
+Recommends: xv-doc, xv-utils
Suggests: ghostscript | gs-esp | gs
Description: image viewer and manipulator
XV is an interactive image manipulation program for the X Window System. It
@@ -40,6 +40,7 @@
Priority: extra
Architecture: any
Depends: xv (= ${binary:Version}),
+ xv-utils (= ${binary:Version}),
${misc:Depends}
Description: image viewer and manipulator (debug)
XV is an interactive image manipulation program for the X Window System. It
@@ -54,7 +55,7 @@
Section: restricted/doc
Architecture: all
Depends: ${misc:Depends}
-Recommends: xv
+Recommends: xv, xv-utils
Suggests: gv | postscript-viewer
Description: image viewer and manipulator (documentation)
XV is an interactive image manipulation program for the X Window System. It
@@ -64,3 +65,18 @@
ghostscript installed on your machine, it can also display them.
.
This package contains the documentation.
+
+Package: xv-utils
+Section: restricted/graphics
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: xv, xv-doc
+Description: image viewer and manipulator (utilities)
+ XV is an interactive image manipulation program for the X Window System. It
+ can operate on images in the GIF, JPEG, TIFF, PBM, PGM, PPM, XPM, X11 bitmap,
+ Sun Rasterfile, Targa, RLE, RGB, BMP, PCX, FITS, and PM formats on all known
+ types of X displays. It can generate PostScript files, and if you have
+ ghostscript installed on your machine, it can also display them.
+ .
+ This package contains additional utilities.
Added: dists/trunk/xv/debian/lintian/xv-utils
===================================================================
--- dists/trunk/xv/debian/lintian/xv-utils (rev 0)
+++ dists/trunk/xv/debian/lintian/xv-utils 2008-02-25 20:50:13 UTC (rev 170)
@@ -0,0 +1 @@
+xv-utils: unknown-section restricted/graphics
Modified: dists/trunk/xv/debian/patches/00list
===================================================================
--- dists/trunk/xv/debian/patches/00list 2008-02-22 15:10:56 UTC (rev 169)
+++ dists/trunk/xv/debian/patches/00list 2008-02-25 20:50:13 UTC (rev 170)
@@ -2,4 +2,4 @@
02-xv-3.10a-jumbo-files-20070520
03-no-docs
04-shared-libjasper
-05-override-cflags
+05-cflags-ldflags
Deleted: dists/trunk/xv/debian/patches/05-override-cflags.dpatch
===================================================================
--- dists/trunk/xv/debian/patches/05-override-cflags.dpatch 2008-02-22 15:10:56 UTC (rev 169)
+++ dists/trunk/xv/debian/patches/05-override-cflags.dpatch 2008-02-25 20:50:13 UTC (rev 170)
@@ -1,104 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05-override-cflags.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make CFLAGS overridable.
-
- at DPATCH@
-diff -urNad xv-3.10a~/Makefile xv-3.10a/Makefile
---- xv-3.10a~/Makefile 2008-01-09 14:03:18.000000000 +0100
-+++ xv-3.10a/Makefile 2008-01-09 14:04:23.000000000 +0100
-@@ -18,29 +18,29 @@
- # -Wuninitialized -Wparentheses
-
-
--CCOPTS = -O
-+CFLAGS = -O
- #
- # these are the usual optimization and warning options for gcc; all such
- # warnings but one (mktemp() use) have been eliminated (at least on Linux):
--#CCOPTS = -O3 -Wall
-+#CFLAGS = -O3 -Wall
- #
- # slightly more warnings... older code often made non-const pointers to
- # static strings (nothing should blow up unless something tries to write
- # to them):
--#CCOPTS = -O3 -Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wnested-externs
-+#CFLAGS = -O3 -Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wnested-externs
- #
- # for the next step up in gcc noise, try adding -W (but note that it adds a
- # huge number of unused-parameter and signed/unsigned comparison warnings):
--#CCOPTS = -O3 -Wall -W
-+#CFLAGS = -O3 -Wall -W
-
- ### NOTE: Sun running OpenWindows:
- ### if you're using a SUN running OPENWINDOWS, you need to add these two
--### options to the CCOPTS line, so it finds the libs and include files
-+### options to the ALL_CFLAGS line, so it finds the libs and include files
- ### -L/usr/openwin/lib -I/usr/openwin/include
- ###
- ### In general, if your X11 include files and libX11.a library aren't in the
- ### 'standard' places in which the C compiler looks, you should add '-L' and
--### '-I' options on the CCOPTS line to tell the compiler where said files are.
-+### '-I' options on the ALL_CFLAGS line to tell the compiler where said files are.
-
-
- # older Unixen don't support the -p option, but its lack may mean installation
-@@ -106,7 +106,7 @@
- ### included in the "tiff" subdir of XV, not an arbitrary copy of libtiff:
- ###
- #$(TIFFLIB):
--# ( cd $(TIFFDIR) ; make CC='$(CC)' COPTS='$(CCOPTS) $(MCHN)' )
-+# ( cd $(TIFFDIR) ; make CC='$(CC)' CFLAGS='$(CFLAGS) $(MCHN)' )
-
-
- ###
-@@ -335,11 +335,12 @@
-
-
-
--CFLAGS = $(CCOPTS) $(PNG) $(PNGINC) $(ZLIBINC) $(JPEG) $(JPEGINC) \
-+ALL_CFLAGS = $(PNG) $(PNGINC) $(ZLIBINC) $(JPEG) $(JPEGINC) \
- $(TIFF) $(TIFFINC) $(PDS) $(JP2K) $(JP2KINC) $(TVL10N) $(MGCSFX) \
- $(UNIX) $(BSDTYPES) $(RAND) $(MALLOC) $(DXWM) $(MCHN) $(NODIRENT) \
- $(VPRINTF) $(TIMERS) -DDOCDIR=\"$(DOCDIR)\" \
-- -DSYSCONFDIR=\"$(SYSCONFDIR)\" -DXVEXECPATH=\"$(LIBDIR)\"
-+ -DSYSCONFDIR=\"$(SYSCONFDIR)\" -DXVEXECPATH=\"$(LIBDIR)\" \
-+ $(CFLAGS)
-
- ### remove -lm for BeOS:
- LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -L/usr/X11R6/lib -lX11 -lm
-@@ -359,7 +360,7 @@
-
-
-
--.c.o: ; $(CC) $(CFLAGS) -c $*.c
-+.c.o: ; $(CC) $(ALL_CFLAGS) -c $*.c
-
-
-
-@@ -369,19 +370,19 @@
-
- #xv: $(OBJS) $(JPEGLIB) $(TIFFLIB)
- xv: $(OBJS)
-- $(CC) -o xv $(CFLAGS) $(OBJS) $(LIBS)
-+ $(CC) -o xv $(ALL_CFLAGS) $(OBJS) $(LIBS)
-
- bggen: bggen.c
-- $(CC) $(CFLAGS) -o bggen bggen.c $(LIBS)
-+ $(CC) $(ALL_CFLAGS) -o bggen bggen.c $(LIBS)
-
- vdcomp: vdcomp.c
-- $(CC) $(CFLAGS) -o vdcomp vdcomp.c
-+ $(CC) $(ALL_CFLAGS) -o vdcomp vdcomp.c
-
- xcmap: xcmap.c
-- $(CC) $(CFLAGS) -o xcmap xcmap.c $(LIBS)
-+ $(CC) $(ALL_CFLAGS) -o xcmap xcmap.c $(LIBS)
-
- xvpictoppm: xvpictoppm.c
-- $(CC) $(CFLAGS) -o xvpictoppm xvpictoppm.c
-+ $(CC) $(ALL_CFLAGS) -o xvpictoppm xvpictoppm.c
-
-
-
Copied: dists/trunk/xv/debian/pixmaps (from rev 169, dists/trunk/xv/debian/pixmap)
Modified: dists/trunk/xv/debian/rules
===================================================================
--- dists/trunk/xv/debian/rules 2008-02-22 15:10:56 UTC (rev 169)
+++ dists/trunk/xv/debian/rules 2008-02-25 20:50:13 UTC (rev 170)
@@ -1,16 +1,20 @@
#!/usr/bin/make -f
+clean:: apply-dpatches
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/dpatch.mk
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
DEB_MAKE_BUILD_TARGET += PREFIX=/usr
-DEB_MAKE_INSTALL_TARGET += install PREFIX=/usr DESTDIR=$(CURDIR)/debian/xv
+DEB_MAKE_INSTALL_TARGET += install PREFIX=/usr DESTDIR=$(CURDIR)/debian/tmp
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+
DEB_INSTALL_CHANGELOGS_ALL += CHANGELOG
-cleanbuilddir:: apply-dpatches
-
common-install-impl::
# Installing bug control
for BUG in debian/bug/*; do \
Added: dists/trunk/xv/debian/xv-utils.install
===================================================================
--- dists/trunk/xv/debian/xv-utils.install (rev 0)
+++ dists/trunk/xv/debian/xv-utils.install 2008-02-25 20:50:13 UTC (rev 170)
@@ -0,0 +1,8 @@
+/usr/bin/bggen
+/usr/bin/vdcomp
+/usr/bin/xcmap
+/usr/bin/xvpictoppm
+/usr/share/man/man1/bggen.1
+/usr/share/man/man1/vdcomp.1
+/usr/share/man/man1/xcmap.1
+/usr/share/man/man1/xvpictoppm.1
Modified: dists/trunk/xv/debian/xv.install
===================================================================
--- dists/trunk/xv/debian/xv.install 2008-02-22 15:10:56 UTC (rev 169)
+++ dists/trunk/xv/debian/xv.install 2008-02-25 20:50:13 UTC (rev 170)
@@ -1 +1,3 @@
-debian/pixmap/xv.xpm /usr/share/pixmaps/
+/usr/bin/xv
+/usr/share/man/man1/xv.1
+../pixmaps/xv.xpm /usr/share/pixmaps/
More information about the Restricted-changes
mailing list