Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12485/10.3/unstable/main/finkinfo/utils
Modified Files:
konwert.info konwert.patch
Log Message:
New revision by maintainer (Submission Tracker #1626790)
- Latest patches from debian
- Updated email and homepage
Index: konwert.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/konwert.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- konwert.patch 12 Feb 2004 19:22:12 -0000 1.1
+++ konwert.patch 3 Jan 2007 22:34:37 -0000 1.2
@@ -1,3 +1,50 @@
+--- konwert-1.8.orig/Makefile
++++ konwert-1.8/Makefile
+@@ -46,9 +46,9 @@
+
+ # Dokumentacja:
+
+-mydocdir = $(prefix)/doc/konwert-$(version)
++mydocdir = $(sharedir)/doc/konwert
+ srcdocdir = doc
+-mandir = $(prefix)/man
++mandir = $(sharedir)/man
+ srcmandir = man
+
+ # Wersje z poprawionymi ¶cie¿kami w #!, gotowe do zainstalowania:
+@@ -181,6 +181,9 @@
+
+
###############################################################################
+
++$(srcbindir)/filterm: $(srcbindir)/filterm.cc
++ $(CXX) $(CXXFLAGS) $< -o $@
++
+ $(installbindir)/konwert: $(srcbindir)/konwert
+ sed 's|/usr/share/konwert/filters|$(filtersdir)|g' $< >$@
+ chmod +x $@
+@@ -335,16 +335,16 @@
+ $(INSTALL) -m755 -s $(installbindir)/trs $(bindir)
+ $(INSTALL) -m755 $(installbindir)/konwert $(bindir)
+ $(INSTALL) -m755 -s $(installbindir)/filterm $(bindir)
+- cp -dRf $(installfiltersdir)/* $(filtersdir)
++ /bin/cp -Rf $(installfiltersdir)/* $(filtersdir)
+ $(perl) $(srcdeveldir)/mkaliases $(srcdeveldir)/aliases \
+ $(installfiltersdir) $(filtersdir)
+- cp -dRf $(installauxdir)/* $(auxdir)
++ /bin/cp -Rf $(installauxdir)/* $(auxdir)
+ $(perl) $(srcdeveldir)/mkaliases $(srcdeveldir)/aliases \
+ $(installauxdir)/charsets $(auxdir)/charsets
+- cp -dRf $(installlibauxdir)/* $(libauxdir)
+- cp -dRf $(installdeveldir)/* $(develdir)
+- cp -dRf $(installdocdir)/* $(mydocdir)
+- cp -dRf $(installmandir)/* $(mandir)
++ /bin/cp -Rf $(installlibauxdir)/* $(libauxdir)
++ /bin/cp -Rf $(installdeveldir)/* $(develdir)
++ /bin/cp -Rf $(installdocdir)/* $(mydocdir)
++ /bin/cp -Rf $(installmandir)/* $(mandir)
+ if [ -z "$(nofixmanconfig)" ]; then $(srcauxdir)/fixmanconfig; fi
+
+
###############################################################################
--- konwert-1.8.orig/doc/en/filters
+++ konwert-1.8/doc/en/filters
@@ -194,6 +194,12 @@
@@ -160,6 +207,267 @@
+ ý ²
+ þ â
+ ÿ Â
+--- konwert-1.8.orig/filters/rtf-8bit
++++ konwert-1.8/filters/rtf-8bit
+@@ -1,130 +1,130 @@
+ #!/usr/bin/trs -f
+
+- '\\80 \x80
+- '\\81 \x81
+- '\\82 \x82
+- '\\83 \x83
+- '\\84 \x84
+- '\\85 \x85
+- '\\86 \x86
+- '\\87 \x87
+- '\\88 \x88
+- '\\89 \x89
+- '\\8a \x8A
+- '\\8b \x8B
+- '\\8c \x8C
+- '\\8d \x8D
+- '\\8e \x8E
+- '\\8f \x8F
+- '\\90 \x90
+- '\\91 \x91
+- '\\92 \x92
+- '\\93 \x93
+- '\\94 \x94
+- '\\95 \x95
+- '\\96 \x96
+- '\\97 \x97
+- '\\98 \x98
+- '\\99 \x99
+- '\\9a \x9A
+- '\\9b \x9B
+- '\\9c \x9C
+- '\\9d \x9D
+- '\\9e \x9E
+- '\\9f \x9F
+- '\\a0 \xA0
+- '\\a1 \xA1
+- '\\a2 \xA2
+- '\\a3 \xA3
+- '\\a4 \xA4
+- '\\a5 \xA5
+- '\\a6 \xA6
+- '\\a7 \xA7
+- '\\a8 \xA8
+- '\\a9 \xA9
+- '\\aa \xAA
+- '\\ab \xAB
+- '\\ac \xAC
+- '\\ad \xAD
+- '\\ae \xAE
+- '\\af \xAF
+- '\\b0 \xB0
+- '\\b1 \xB1
+- '\\b2 \xB2
+- '\\b3 \xB3
+- '\\b4 \xB4
+- '\\b5 \xB5
+- '\\b6 \xB6
+- '\\b7 \xB7
+- '\\b8 \xB8
+- '\\b9 \xB9
+- '\\ba \xBA
+- '\\bb \xBB
+- '\\bc \xBC
+- '\\bd \xBD
+- '\\be \xBE
+- '\\bf \xBF
+- '\\c0 \xC0
+- '\\c1 \xC1
+- '\\c2 \xC2
+- '\\c3 \xC3
+- '\\c4 \xC4
+- '\\c5 \xC5
+- '\\c6 \xC6
+- '\\c7 \xC7
+- '\\c8 \xC8
+- '\\c9 \xC9
+- '\\ca \xCA
+- '\\cb \xCB
+- '\\cc \xCC
+- '\\cd \xCD
+- '\\ce \xCE
+- '\\cf \xCF
+- '\\d0 \xD0
+- '\\d1 \xD1
+- '\\d2 \xD2
+- '\\d3 \xD3
+- '\\d4 \xD4
+- '\\d5 \xD5
+- '\\d6 \xD6
+- '\\d7 \xD7
+- '\\d8 \xD8
+- '\\d9 \xD9
+- '\\da \xDA
+- '\\db \xDB
+- '\\dc \xDC
+- '\\dd \xDD
+- '\\de \xDE
+- '\\df \xDF
+- '\\e0 \xE0
+- '\\e1 \xE1
+- '\\e2 \xE2
+- '\\e3 \xE3
+- '\\e4 \xE4
+- '\\e5 \xE5
+- '\\e6 \xE6
+- '\\e7 \xE7
+- '\\e8 \xE8
+- '\\e9 \xE9
+- '\\ea \xEA
+- '\\eb \xEB
+- '\\ec \xEC
+- '\\ed \xED
+- '\\ee \xEE
+- '\\ef \xEF
+- '\\f0 \xF0
+- '\\f1 \xF1
+- '\\f2 \xF2
+- '\\f3 \xF3
+- '\\f4 \xF4
+- '\\f5 \xF5
+- '\\f6 \xF6
+- '\\f7 \xF7
+- '\\f8 \xF8
+- '\\f9 \xF9
+- '\\fa \xFA
+- '\\fb \xFB
+- '\\fc \xFC
+- '\\fd \xFD
+- '\\fe \xFE
+- '\\ff \xFF
++ \\'80 \x80
++ \\'81 \x81
++ \\'82 \x82
++ \\'83 \x83
++ \\'84 \x84
++ \\'85 \x85
++ \\'86 \x86
++ \\'87 \x87
++ \\'88 \x88
++ \\'89 \x89
++ \\'8a \x8A
++ \\'8b \x8B
++ \\'8c \x8C
++ \\'8d \x8D
++ \\'8e \x8E
++ \\'8f \x8F
++ \\'90 \x90
++ \\'91 \x91
++ \\'92 \x92
++ \\'93 \x93
++ \\'94 \x94
++ \\'95 \x95
++ \\'96 \x96
++ \\'97 \x97
++ \\'98 \x98
++ \\'99 \x99
++ \\'9a \x9A
++ \\'9b \x9B
++ \\'9c \x9C
++ \\'9d \x9D
++ \\'9e \x9E
++ \\'9f \x9F
++ \\'a0 \xA0
++ \\'a1 \xA1
++ \\'a2 \xA2
++ \\'a3 \xA3
++ \\'a4 \xA4
++ \\'a5 \xA5
++ \\'a6 \xA6
++ \\'a7 \xA7
++ \\'a8 \xA8
++ \\'a9 \xA9
++ \\'aa \xAA
++ \\'ab \xAB
++ \\'ac \xAC
++ \\'ad \xAD
++ \\'ae \xAE
++ \\'af \xAF
++ \\'b0 \xB0
++ \\'b1 \xB1
++ \\'b2 \xB2
++ \\'b3 \xB3
++ \\'b4 \xB4
++ \\'b5 \xB5
++ \\'b6 \xB6
++ \\'b7 \xB7
++ \\'b8 \xB8
++ \\'b9 \xB9
++ \\'ba \xBA
++ \\'bb \xBB
++ \\'bc \xBC
++ \\'bd \xBD
++ \\'be \xBE
++ \\'bf \xBF
++ \\'c0 \xC0
++ \\'c1 \xC1
++ \\'c2 \xC2
++ \\'c3 \xC3
++ \\'c4 \xC4
++ \\'c5 \xC5
++ \\'c6 \xC6
++ \\'c7 \xC7
++ \\'c8 \xC8
++ \\'c9 \xC9
++ \\'ca \xCA
++ \\'cb \xCB
++ \\'cc \xCC
++ \\'cd \xCD
++ \\'ce \xCE
++ \\'cf \xCF
++ \\'d0 \xD0
++ \\'d1 \xD1
++ \\'d2 \xD2
++ \\'d3 \xD3
++ \\'d4 \xD4
++ \\'d5 \xD5
++ \\'d6 \xD6
++ \\'d7 \xD7
++ \\'d8 \xD8
++ \\'d9 \xD9
++ \\'da \xDA
++ \\'db \xDB
++ \\'dc \xDC
++ \\'dd \xDD
++ \\'de \xDE
++ \\'df \xDF
++ \\'e0 \xE0
++ \\'e1 \xE1
++ \\'e2 \xE2
++ \\'e3 \xE3
++ \\'e4 \xE4
++ \\'e5 \xE5
++ \\'e6 \xE6
++ \\'e7 \xE7
++ \\'e8 \xE8
++ \\'e9 \xE9
++ \\'ea \xEA
++ \\'eb \xEB
++ \\'ec \xEC
++ \\'ed \xED
++ \\'ee \xEE
++ \\'ef \xEF
++ \\'f0 \xF0
++ \\'f1 \xF1
++ \\'f2 \xF2
++ \\'f3 \xF3
++ \\'f4 \xF4
++ \\'f5 \xF5
++ \\'f6 \xF6
++ \\'f7 \xF7
++ \\'f8 \xF8
++ \\'f9 \xF9
++ \\'fa \xFA
++ \\'fb \xFB
++ \\'fc \xFC
++ \\'fd \xFD
++ \\'fe \xFE
++ \\'ff \xFF
--- konwert-1.8.orig/filters/UTF8-prn7pl
+++ konwert-1.8/filters/UTF8-prn7pl
@@ -0,0 +1,64 @@
@@ -296,6 +604,121 @@
z = z->nast;
}
goto zamienione;
+--- konwert-1.8.orig/bin/filterm.cc
++++ konwert-1.8/bin/filterm.cc
+@@ -10,16 +10,16 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <util.h>
+
+ #define WERSJA "1.8"
+
+ char *nazwaprogramu;
+ char *shell;
+ int master;
+-int slave;
++int slave = -1;
+ struct termios tt;
+ struct winsize win;
+-char line[] = "/dev/ptyXX";
+
+ void uzycie (int status)
+ {
+@@ -54,36 +54,31 @@
+ exit (0);
+ }
+
+-void getmaster()
++static char linedata[PATH_MAX];
++char *line = linedata;
++
++int getpty(void) {
++ if (openpty(&master, &slave, line, NULL, NULL)) {
++ return -1;
++ } return master;
++}
++
++
++void getmasterslave()
+ {
+- char *pty = &line[strlen ("/dev/ptyp")];
+- for (char *bank = "pqrs"; *bank; bank++)
+- {
+- line[strlen ("/dev/pty")] = *bank;
+- *pty = '0';
+- struct stat stb;
+- if (stat (line, &stb) < 0) break;
+- for (char *cp = "0123456789abcdef"; *cp; cp++)
+- {
+- *pty = *cp;
+- if ((master = open (line, O_RDWR)) >= 0)
+- {
+- char *tp = &line[strlen("/dev/")];
+- *tp = 't';
+- int ok = !access (line, R_OK|W_OK);
+- *tp = 'p';
+- if (ok)
+- {
+- tcgetattr (0, &tt);
+- ioctl (0, TIOCGWINSZ, (char *) &win);
+- return;
+- }
+- close (master);
+- }
+- }
++ int r;
++ r = getpty();
++ if (r==-1) {
++ cerr << "Error opening pty\n";
++ exit (1);
+ }
+- cerr << "Out of pty's\n";
+- exit (1);
++
++ tcgetattr (0, &tt);
++ ioctl (0, TIOCGWINSZ, (char *) &win);
++ tcsetattr (slave, TCSAFLUSH, &tt);
++ ioctl (slave, TIOCSWINSZ, (char *) &win);
++ setsid();
++ ioctl (slave, TIOCSCTTY, 0);
+ }
+
+ void terminalsurowy()
+@@ -114,24 +109,8 @@
+ exit (1);
+ }
+
+-void getslave()
+-{
+- line[strlen ("/dev/")] = 't';
+- slave = open (line, O_RDWR);
+- if (slave < 0)
+- {
+- perror (line);
+- exit (1);
+- }
+- tcsetattr (slave, TCSAFLUSH, &tt);
+- ioctl (slave, TIOCSWINSZ, (char *) &win);
+- setsid();
+- ioctl (slave, TIOCSCTTY, 0);
+-}
+-
+ void komenda (int argc, char *argv[])
+ {
+- getslave();
+ dup2 (slave, 0);
+ dup2 (slave, 1);
+ dup2 (slave, 2);
+@@ -181,7 +160,7 @@
+ }
+ if (argc < 3) uzycie (0);
+
+- getmaster();
++ getmasterslave();
+ signal (SIGCHLD, koniec);
+
+ if (strcmp (argv[2], "-"))
--- konwert-1.8.orig/man/man1/konwert.1
+++ konwert-1.8/man/man1/konwert.1
@@ -533,6 +533,17 @@
@@ -318,6 +741,15 @@
.PD 0
--- konwert-1.8.orig/man/pl/man1/konwert.1
+++ konwert-1.8/man/pl/man1/konwert.1
+@@ -52,7 +52,7 @@
+ .PP
+ .B konwert
+ .BI '( "KOMENDA ARG\fR.\|.\|.\|" )'
+-wykonuje dane polecenie szela. Jest to przydatne z opcjami
++wykonuje dane polecenie pow³oki. Jest to przydatne z opcjami
+ .B \-o
+ albo
+ .BR \-O .
@@ -531,6 +531,17 @@
.B tolower
.PD
@@ -336,46 +768,62 @@
.SH PLIKI
.TP
.PD 0
---- konwert-1.8/Makefile Thu Jul 30 18:43:04 1998
-+++ konwert-1.8/Makefile Sun Feb 1 03:14:22 2004
-@@ -46,9 +46,9 @@
-
- # Dokumentacja:
-
--mydocdir = $(prefix)/doc/konwert-$(version)
-+mydocdir = $(sharedir)/doc/konwert
- srcdocdir = doc
--mandir = $(prefix)/man
-+mandir = $(sharedir)/man
- srcmandir = man
-
- # Wersje z poprawionymi ¶cie¿kami w #!, gotowe do zainstalowania:
-@@ -335,16 +335,16 @@
- $(INSTALL) -m755 -s $(installbindir)/trs $(bindir)
- $(INSTALL) -m755 $(installbindir)/konwert $(bindir)
- $(INSTALL) -m755 -s $(installbindir)/filterm $(bindir)
-- cp -dRf $(installfiltersdir)/* $(filtersdir)
-+ /bin/cp -Rf $(installfiltersdir)/* $(filtersdir)
- $(perl) $(srcdeveldir)/mkaliases $(srcdeveldir)/aliases \
- $(installfiltersdir) $(filtersdir)
-- cp -dRf $(installauxdir)/* $(auxdir)
-+ /bin/cp -Rf $(installauxdir)/* $(auxdir)
- $(perl) $(srcdeveldir)/mkaliases $(srcdeveldir)/aliases \
- $(installauxdir)/charsets $(auxdir)/charsets
-- cp -dRf $(installlibauxdir)/* $(libauxdir)
-- cp -dRf $(installdeveldir)/* $(develdir)
-- cp -dRf $(installdocdir)/* $(mydocdir)
-- cp -dRf $(installmandir)/* $(mandir)
-+ /bin/cp -Rf $(installlibauxdir)/* $(libauxdir)
-+ /bin/cp -Rf $(installdeveldir)/* $(develdir)
-+ /bin/cp -Rf $(installdocdir)/* $(mydocdir)
-+ /bin/cp -Rf $(installmandir)/* $(mandir)
- if [ -z "$(nofixmanconfig)" ]; then $(srcauxdir)/fixmanconfig; fi
-
-
###############################################################################
+--- konwert-1.8.orig/debian/README.debian
++++ konwert-1.8/debian/README.debian
+@@ -0,0 +1,10 @@
++The Debian Package `konwert'
++----------------------------
++
++There are no shipped manpages in this version, but the 3 user-level
++programs (konvert, filterm, trs) are documented in English and Polish
++in the subdirs of this directory.
++
++These should surely be converted into manpages.
++
++Yann Dirson <[EMAIL PROTECTED]>, Mon, 22 Jun 1998 09:19:36 +0200
--- konwert-1.8.orig/debian/changelog
+++ konwert-1.8/debian/changelog
-@@ -0,0 +1,109 @@
+@@ -0,0 +1,149 @@
++konwert (1.8-11) unstable; urgency=low
++
++ * Switch from debhelper v1 mode to v5:
++ * bash-completion script now maked as conffile (Closes: #358376).
++ * use ${misc:Depends} for every binary package.
++ * Fixed problem in a polish manpage (Closes: #296246).
++ * Fixed capitalization in README.Debian (lintian).
++ * Bumped Standards-Version to 3.6.2, no change.
++
++ -- Yann Dirson <[EMAIL PROTECTED]> Tue, 11 Apr 2006 01:22:10 +0200
++
++konwert (1.8-10) unstable; urgency=low
++
++ * Build with g++-4.0.
++
++ -- Yann Dirson <[EMAIL PROTECTED]> Tue, 5 Jul 2005 23:25:19 +0200
++
++konwert (1.8-9) unstable; urgency=low
++
++ * Fixed rtf-8bit to recognize the good escape sequences (Closes: #182439).
++ * Include bash-completion script for konwert(1) from Vitalij K. Lysoff.
++ * Fixed dh_buildinfo call to occur in binary-arch; ship a docdir in
++ konwert package instead of a symlink to allow this; create symlinks to
++ en and pl docdirs to leave docs easily found.
++ * Reworked debian/rules a bit: added an install target to help
++ accomodating for this change.
++ * Updated my email in README.Debian and copyright; updated upstream URL
++ in copyright.
++
++ -- Yann Dirson <[EMAIL PROTECTED]> Thu, 29 Apr 2004 00:30:26 +0200
++
++konwert (1.8-8) unstable; urgency=low
++
++ * Applied longstanding patch from Radovan Garabik to use UNIX98 ptys
++ (Closes: #108583, #195451). Link filterm with libutil.
++ * Avoid redifinition of PATH_MAX in filterm.cc.
++ * Use dh-buildinfo.
++
++ -- Yann Dirson <[EMAIL PROTECTED]> Fri, 9 Jan 2004 16:31:57 +0100
++
+konwert (1.8-7) unstable; urgency=low
+
+ * Added support for mik from Kaloian Doganov (Closes: #196510).
@@ -485,3 +933,16 @@
+ * Passed lintian 0.4.8.
+
+ -- Yann Dirson <[EMAIL PROTECTED]> Mon, 22 Jun 1998 09:19:36 +0200
+--- konwert-1.8.orig/debian/copyright
++++ konwert-1.8/debian/copyright
+@@ -0,0 +1,8 @@
++This package was debianized by Yann Dirson <[EMAIL PROTECTED]>,
++from sources available from:
++
++http://qrczak.ids.net.pl/programy/linux/konwert/
++
++Upstream author is Marcin 'Qrczak' Kowalczyk <[EMAIL PROTECTED]>.
++
++Copyright: GPL (see /usr/share/common-licenses/GPL).
+
+
Index: konwert.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/utils/konwert.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- konwert.info 17 Jul 2005 08:37:19 -0000 1.2
+++ konwert.info 3 Jan 2007 22:34:37 -0000 1.3
@@ -1,18 +1,18 @@
Package: konwert
Version: 1.8
-Revision: 1
+Revision: 2
GCC: 3.3
Description: Charset conversion for files or terminal I/O
License: GPL
-Maintainer: Beat Birkhofer <[EMAIL PROTECTED]>
+Maintainer: Beat Birkhofer <[EMAIL PROTECTED]>
Source: mirror:debian:pool/main/k/%n/%n_%v.orig.tar.gz
Source-MD5: 838e73ec911ebf25816135cbfd0f7a04
SourceDirectory: %n-%v
PatchScript: patch -p1 <%a/%n.patch
CompileScript: make prefix=%p
InstallScript: make install prefix=%i
-DocFiles: COPYING CZYTAJTO README
-Homepage: http://qrczak.ids.net.pl/programy/linux/konwert/
+DocFiles: COPYING CZYTAJTO README debian/README.debian debian/changelog
debian/copyright
+Homepage: http://qrnik.knm.org.pl/~qrczak/tmp/konwert/
DescDetail:<<
`konwert' is yet another charset converter. Some particular features are:
* one-to-many conversions
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
