[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31071 - in gnunet/contrib: . businesscards
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r31071 - in gnunet/contrib: . businesscards |
|
Date: |
Thu, 5 Dec 2013 14:41:28 +0100 |
Author: grothoff
Date: 2013-12-05 14:41:28 +0100 (Thu, 05 Dec 2013)
New Revision: 31071
Added:
gnunet/contrib/gns-bcd.html
gnunet/contrib/gns-bcd.tex
gnunet/contrib/gnunet-logo.pdf
Removed:
gnunet/contrib/businesscards/card.tex
gnunet/contrib/businesscards/fields.html
gnunet/contrib/businesscards/gnunet-logo.pdf
Modified:
gnunet/contrib/Makefile.am
Log:
-rename and install
Modified: gnunet/contrib/Makefile.am
===================================================================
--- gnunet/contrib/Makefile.am 2013-12-05 13:15:05 UTC (rev 31070)
+++ gnunet/contrib/Makefile.am 2013-12-05 13:41:28 UTC (rev 31071)
@@ -9,7 +9,7 @@
if !MINGW
timeout_watchdog_SOURCES = \
- timeout_watchdog.c
+ timeout_watchdog.c
else
timeout_watchdog_SOURCES = \
timeout_watchdog_w32.c
@@ -25,6 +25,9 @@
gnunet-gns-import.sh
dist_pkgdata_DATA = \
+ gns-bcd.html \
+ gns-bcd.tex \
+ gnunet-logo.pdf \
gnunet-logo-color.png \
testing_hostkeys.ecc
@@ -56,7 +59,7 @@
openvpn-tap32/tapw64/OemWin2k.inf \
openvpn-tap32/INSTALL \
openvpn-tap32/tap32-signed-i386-2.1.zip \
- openvpn-tap32/tap32-source-2.1.zip
+ openvpn-tap32/tap32-source-2.1.zip
do_subst = $(SED) -e 's,address@hidden@],$(PYTHON),g'
@@ -70,7 +73,7 @@
# gnmessage.sh \
# junkinsert.sh \
# junklookup.sh \
-# namespacehelper.sh
+# namespacehelper.sh
check_PROGRAMS = \
@@ -90,12 +93,12 @@
$(GCLIBADD) $(WINLIB) \
$(LTLIBICONV) \
$(GN_LIBINTL) \
- $(LIBLTDL) -lunistring $(XLIB)
+ $(LIBLTDL) -lunistring $(XLIB)
pkghellodir= $(pkgdatadir)/hellos
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(pkghellodir)
+ $(mkinstalldirs) $(DESTDIR)$(pkghellodir)
@$(NORMAL_INSTALL)
for hello in $(srcdir)/hellos/*; do \
if test -f $$hello; then \
Deleted: gnunet/contrib/businesscards/card.tex
===================================================================
--- gnunet/contrib/businesscards/card.tex 2013-12-05 13:15:05 UTC (rev
31070)
+++ gnunet/contrib/businesscards/card.tex 2013-12-05 13:41:28 UTC (rev
31071)
@@ -1,99 +0,0 @@
-\documentclass[14pt,a4paper,oneside,ngerman]{scrartcl}
-
-\usepackage{geometry}
-\geometry{paperwidth=95mm, paperheight=65mm,left=0mm,right=0mm, top=0mm,
bottom=0mm}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{graphicx}
-\usepackage{units}
-\usepackage{tikz}
-\usepackage{pst-barcode}
-\usepackage{auto-pst-pdf}
-\usetikzlibrary{positioning,shapes,shadows,arrows}
-
-
-\input{fields.tex}
-
-\renewcommand{\rmdefault}{phv}
-\renewcommand{\seriesdefault}{m}
-\renewcommand{\shapedefault}{n}
-
-\definecolor{MyBlack}{cmyk}{0,0,0,1}
-
-\setlength\parindent{0pt}
-\newlength{\width}
-\newlength{\height}
-\setlength{\width}{85mm}
-\setlength{\height}{55mm}
-
-
-\newcommand{\card}[1]{
- \begin{tikzpicture}[font=\tiny]
- \draw[-,line width=1pt,MyBlack] (-5mm,0mm) to (-2mm,0mm);
- \draw[-,line width=1pt,MyBlack] (0mm,5mm) to (0mm,2mm);
-
- \draw[-,line width=1pt,MyBlack] [xshift=2mm](\width,0mm) to
[xshift=3mm](\width,0mm);
- \draw[-,line width=1pt,MyBlack] (\width,5mm) to (\width,2mm);
-
- \draw[-,line width=1pt,MyBlack] (-5mm,-\height) to (-2mm,-\height);
- \draw[-,line width=1pt,MyBlack] [yshift=-2mm](0mm,-\height) to
[yshift=-3mm](0mm,-\height);
-
- \draw[-,line width=1pt,MyBlack] [xshift=2mm](\width,-\height) to
[xshift=3mm](\width,-\height);
- \draw[-,line width=1pt,MyBlack] [yshift=-2mm](\width,-\height) to
[yshift=-3mm](\width,-\height);
-
-
- \node at (78mm,-7mm)
{\includegraphics[height=7mm]{gnunet-logo.pdf}};
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-16mm) {\orga};
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-21.5mm)
{\ifthenelse{\equal{#1}{english}}{\departmenten}{\departmentde}};
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-24.0mm)
{\ifthenelse{\equal{#1}{english}}{\subdepartmenten}{\subdepartmentde}};
-
- \ifthenelse{\equal{\gpglineone}{}\or\equal{#1}{german}}{
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-35mm) {\street};
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-37.5mm) {\city};
-
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-41.5mm) {Tel};
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-44.0mm) {Fax};
- \node[rectangle,draw=white,minimum height=7pt,text
width=30mm,inner sep=0pt] at (65mm,-41.5mm) {\phone};
- \node[rectangle,draw=white,minimum height=7pt,text
width=30mm,inner sep=0pt] at (65mm,-44.0mm) {\fax};
-
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-48.0mm) {\email};
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-50.5mm) {\homepage};
- }
- {
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-35.0mm) {\email};
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-37.5mm) {\homepage};
-
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-44.0mm) {GPG Fingerprint:};
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-46.5mm) {\gpglineone};
- \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-49.0mm) {\gpglinetwo};
- }
-
- \ifthenelse{\equal{\gns}{}\or\equal{#1}{english}}{
- \node[rectangle,draw=white,minimum height=7pt,text
width=41mm,inner sep=0pt] at (24.25mm,-21.0mm)
{\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}};
- \node[rectangle,draw=white,minimum height=7pt,text
width=41mm,inner sep=0pt] at (24.25mm,-24.0mm) {\fontsize{8pt}{8pt}\selectfont
\textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}};
- \node[rectangle,draw=white,minimum height=7pt,text
width=41mm,inner sep=0pt] at (24.25mm,-29.0mm)
{\ifthenelse{\equal{#1}{english}}{\textit{\jobtitleenglish}}{\textit{\jobtitlegerman}}};
- }
- {
- \node[rectangle,draw=black,line width=1pt,inner sep=0pt] at
(12.5mm,-14.75mm) {\begin{pspicture}(17mm,17mm)
\psbarcode{\gns}{}{qrcode}\end{pspicture}};
- \node[rectangle,draw=white,minimum height=7pt,text
width=41mm,inner sep=0pt] at (24.25mm,-32.0mm)
{\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}};
- \node[rectangle,draw=white,minimum height=7pt,text
width=41mm,inner sep=0pt] at (24.25mm,-35.0mm) {\fontsize{8pt}{8pt}\selectfont
\textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}};
- \node[rectangle,draw=white,minimum height=7pt,text
width=41mm,inner sep=0pt] at (24.25mm,-41.5mm)
{\ifthenelse{\equal{#1}{english}}{\textit{\jobtitleenglish}}{\textit{\jobtitlegerman}}};
- }
- \end{tikzpicture}
-}
-
-
-\begin{document}
-\begin{figure}
- \begin{center}
- \card{german}
- \end{center}
-\end{figure}
-\clearpage
-\begin{figure}
- \begin{center}
- \card{english}
- \end{center}
-\end{figure}
-\end{document}
-
Deleted: gnunet/contrib/businesscards/fields.html
===================================================================
--- gnunet/contrib/businesscards/fields.html 2013-12-05 13:15:05 UTC (rev
31070)
+++ gnunet/contrib/businesscards/fields.html 2013-12-05 13:41:28 UTC (rev
31071)
@@ -1,40 +0,0 @@
-<html>
-<head>
-<title>Create your GNU Name System Businesscard</title>
-</head>
-<body>
-Please fill in the information below to generate your business
-card. Yes, this form is the ugliest you've seen in a while,
-feel free to send us a nicer version of the HTML.
-<p>
-<form name="gnsinput" action="submit" method="get">
-
-Academic Title (prefix): <input type="text" name="prefix"><br>
-Name: <input type="text" name="name"><br>
-Academic Title (suffix): <input type="text" name="suffix"><br>
-<p>
-Street: <input type="text" name="street"><br>
-City (and ZIP code): <input type="text" name="city"><br>
-<p>
-Phone: <input type="text" name="phone"><br>
-Fax: <input type="text" name="fax"><br>
-E-mail: <input type="text" name="email"><br>
-Homepage: <input type="text" name="homepage"><br>
-<p>
-Organization: <input type="text" name="orga"><br>
-Department (German): <input type="text" name="departmentde"><br>
-Department (English): <input type="text" name="departmenten"><br>
-Division (German): <input type="text" name="subdepartmentde"><br>
-Division (English): <input type="text" name="subdepartmenten"><br>
-<p>
-Jobtitle (German): <input type="text" name="jobtitlegerman"><br>
-Jobtitle (English): <input type="text" name="jobtitleenglish"><br>
-Academic Title (suffix): <input type="text" name="suffix"><br>
-<p>
-GPG Fingerprint: <input type="text" name="gpgfingerprint"><br>
-GNS Public Key: <input type="text" name="gnskey"><br>
-GNS Nickname: <input type="text" name="gnsnick"><br>
-<p>
-<input type="submit">
-</form>
-</body>
Deleted: gnunet/contrib/businesscards/gnunet-logo.pdf
===================================================================
(Binary files differ)
Copied: gnunet/contrib/gns-bcd.html (from rev 31063,
gnunet/contrib/businesscards/fields.html)
===================================================================
--- gnunet/contrib/gns-bcd.html (rev 0)
+++ gnunet/contrib/gns-bcd.html 2013-12-05 13:41:28 UTC (rev 31071)
@@ -0,0 +1,40 @@
+<html>
+<head>
+<title>Create your GNU Name System Businesscard</title>
+</head>
+<body>
+Please fill in the information below to generate your business
+card. Yes, this form is the ugliest you've seen in a while,
+feel free to send us a nicer version of the HTML.
+<p>
+<form name="gnsinput" action="submit" method="get">
+
+Academic Title (prefix): <input type="text" name="prefix"><br>
+Name: <input type="text" name="name"><br>
+Academic Title (suffix): <input type="text" name="suffix"><br>
+<p>
+Street: <input type="text" name="street"><br>
+City (and ZIP code): <input type="text" name="city"><br>
+<p>
+Phone: <input type="text" name="phone"><br>
+Fax: <input type="text" name="fax"><br>
+E-mail: <input type="text" name="email"><br>
+Homepage: <input type="text" name="homepage"><br>
+<p>
+Organization: <input type="text" name="orga"><br>
+Department (German): <input type="text" name="departmentde"><br>
+Department (English): <input type="text" name="departmenten"><br>
+Division (German): <input type="text" name="subdepartmentde"><br>
+Division (English): <input type="text" name="subdepartmenten"><br>
+<p>
+Jobtitle (German): <input type="text" name="jobtitlegerman"><br>
+Jobtitle (English): <input type="text" name="jobtitleenglish"><br>
+Academic Title (suffix): <input type="text" name="suffix"><br>
+<p>
+GPG Fingerprint: <input type="text" name="gpgfingerprint"><br>
+GNS Public Key: <input type="text" name="gnskey"><br>
+GNS Nickname: <input type="text" name="gnsnick"><br>
+<p>
+<input type="submit">
+</form>
+</body>
Copied: gnunet/contrib/gns-bcd.tex (from rev 31063,
gnunet/contrib/businesscards/card.tex)
===================================================================
--- gnunet/contrib/gns-bcd.tex (rev 0)
+++ gnunet/contrib/gns-bcd.tex 2013-12-05 13:41:28 UTC (rev 31071)
@@ -0,0 +1,99 @@
+\documentclass[14pt,a4paper,oneside,ngerman]{scrartcl}
+
+\usepackage{geometry}
+\geometry{paperwidth=95mm, paperheight=65mm,left=0mm,right=0mm, top=0mm,
bottom=0mm}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{graphicx}
+\usepackage{units}
+\usepackage{tikz}
+\usepackage{pst-barcode}
+\usepackage{auto-pst-pdf}
+\usetikzlibrary{positioning,shapes,shadows,arrows}
+
+
+\input{fields.tex}
+
+\renewcommand{\rmdefault}{phv}
+\renewcommand{\seriesdefault}{m}
+\renewcommand{\shapedefault}{n}
+
+\definecolor{MyBlack}{cmyk}{0,0,0,1}
+
+\setlength\parindent{0pt}
+\newlength{\width}
+\newlength{\height}
+\setlength{\width}{85mm}
+\setlength{\height}{55mm}
+
+
+\newcommand{\card}[1]{
+ \begin{tikzpicture}[font=\tiny]
+ \draw[-,line width=1pt,MyBlack] (-5mm,0mm) to (-2mm,0mm);
+ \draw[-,line width=1pt,MyBlack] (0mm,5mm) to (0mm,2mm);
+
+ \draw[-,line width=1pt,MyBlack] [xshift=2mm](\width,0mm) to
[xshift=3mm](\width,0mm);
+ \draw[-,line width=1pt,MyBlack] (\width,5mm) to (\width,2mm);
+
+ \draw[-,line width=1pt,MyBlack] (-5mm,-\height) to (-2mm,-\height);
+ \draw[-,line width=1pt,MyBlack] [yshift=-2mm](0mm,-\height) to
[yshift=-3mm](0mm,-\height);
+
+ \draw[-,line width=1pt,MyBlack] [xshift=2mm](\width,-\height) to
[xshift=3mm](\width,-\height);
+ \draw[-,line width=1pt,MyBlack] [yshift=-2mm](\width,-\height) to
[yshift=-3mm](\width,-\height);
+
+
+ \node at (78mm,-7mm)
{\includegraphics[height=7mm]{gnunet-logo.pdf}};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-16mm) {\orga};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-21.5mm)
{\ifthenelse{\equal{#1}{english}}{\departmenten}{\departmentde}};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-24.0mm)
{\ifthenelse{\equal{#1}{english}}{\subdepartmenten}{\subdepartmentde}};
+
+ \ifthenelse{\equal{\gpglineone}{}\or\equal{#1}{german}}{
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-35mm) {\street};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-37.5mm) {\city};
+
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-41.5mm) {Tel};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-44.0mm) {Fax};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=30mm,inner sep=0pt] at (65mm,-41.5mm) {\phone};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=30mm,inner sep=0pt] at (65mm,-44.0mm) {\fax};
+
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-48.0mm) {\email};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-50.5mm) {\homepage};
+ }
+ {
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-35.0mm) {\email};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-37.5mm) {\homepage};
+
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-44.0mm) {GPG Fingerprint:};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-46.5mm) {\gpglineone};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=37.5mm,inner sep=0pt] at (64.25mm,-49.0mm) {\gpglinetwo};
+ }
+
+ \ifthenelse{\equal{\gns}{}\or\equal{#1}{english}}{
+ \node[rectangle,draw=white,minimum height=7pt,text
width=41mm,inner sep=0pt] at (24.25mm,-21.0mm)
{\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=41mm,inner sep=0pt] at (24.25mm,-24.0mm) {\fontsize{8pt}{8pt}\selectfont
\textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=41mm,inner sep=0pt] at (24.25mm,-29.0mm)
{\ifthenelse{\equal{#1}{english}}{\textit{\jobtitleenglish}}{\textit{\jobtitlegerman}}};
+ }
+ {
+ \node[rectangle,draw=black,line width=1pt,inner sep=0pt] at
(12.5mm,-14.75mm) {\begin{pspicture}(17mm,17mm)
\psbarcode{\gns}{}{qrcode}\end{pspicture}};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=41mm,inner sep=0pt] at (24.25mm,-32.0mm)
{\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=41mm,inner sep=0pt] at (24.25mm,-35.0mm) {\fontsize{8pt}{8pt}\selectfont
\textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}};
+ \node[rectangle,draw=white,minimum height=7pt,text
width=41mm,inner sep=0pt] at (24.25mm,-41.5mm)
{\ifthenelse{\equal{#1}{english}}{\textit{\jobtitleenglish}}{\textit{\jobtitlegerman}}};
+ }
+ \end{tikzpicture}
+}
+
+
+\begin{document}
+\begin{figure}
+ \begin{center}
+ \card{german}
+ \end{center}
+\end{figure}
+\clearpage
+\begin{figure}
+ \begin{center}
+ \card{english}
+ \end{center}
+\end{figure}
+\end{document}
+
Copied: gnunet/contrib/gnunet-logo.pdf (from rev 31063,
gnunet/contrib/businesscards/gnunet-logo.pdf)
===================================================================
(Binary files differ)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31071 - in gnunet/contrib: . businesscards,
gnunet <=