From 9ebb4050ca356f037cfef494ee0e0d235bcdff49 Mon Sep 17 00:00:00 2001 From: Philipp Kern Date: Sat, 24 Oct 2009 17:32:37 +0200 Subject: [PATCH] Imported Debian patch 20070115-10 --- Makefile | 2 +- debian/changelog | 12 +++ debian/control | 12 ++- debian/patches/01_no-shipped-init-script.patch | 20 ++++ debian/patches/02_skip-strip.patch | 20 ++++ debian/patches/03_no-quiet-gcc.patch | 16 +++ debian/patches/04_kfreebsd.patch | 20 ++++ debian/patches/series | 4 + debian/po/ru.po | 131 +++++++++++++++++++++++++ debian/po/sv.po | 126 ++++++++++++++++++++++++ debian/rules | 6 +- unix-console/Makefile | 5 + 12 files changed, 366 insertions(+), 8 deletions(-) create mode 100644 debian/patches/01_no-shipped-init-script.patch create mode 100644 debian/patches/02_skip-strip.patch create mode 100644 debian/patches/03_no-quiet-gcc.patch create mode 100644 debian/patches/04_kfreebsd.patch create mode 100644 debian/patches/series create mode 100644 debian/po/ru.po create mode 100644 debian/po/sv.po diff --git a/Makefile b/Makefile index cc3852d..0e96136 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ ifeq ($(shell echo "A${RPM_BUILD_ROOT}"),A) @cp doc/HOWTO ${DESTDIR}${dirdoc} @echo "Installing Debian-style init.d" @mkdir -p ${DESTDIR}${diretc}init.d -# @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} + @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} else @echo "Installing Redhat-style init.d" @mkdir -p ${DESTDIR}${diretc}init.d diff --git a/debian/changelog b/debian/changelog index d132305..050c8ba 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +aiccu (20070115-10) unstable; urgency=low + + * QA upload. + * Set maintainer to `Debian QA group'. + * Build-depend on quilt and convert direct patches to quilt patches. + * Drop VCS-* headers. + * Add support for Debian GNU/kFreeBSD, thanks to Axel Beckert. + * Added Swedish and Russian Debconf translations, thanks to + Martin Bagge and Yuri Kozlov. (Closes: #510800, #545217) + + -- Philipp Kern Sat, 24 Oct 2009 17:32:37 +0200 + aiccu (20070115-9) unstable; urgency=medium * Do not leave Default-{Start,Stop} empty. (Closes: #487194) diff --git a/debian/control b/debian/control index cc11b22..ec0f876 100755 --- a/debian/control +++ b/debian/control @@ -1,16 +1,18 @@ Source: aiccu Section: net Priority: optional -Maintainer: Philipp Kern -Build-Depends: debhelper (>= 4.0.0), po-debconf, libgnutls-dev, docbook-to-man +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 4.0.0), po-debconf, libgnutls-dev, docbook-to-man, quilt Standards-Version: 3.7.2 -VCS-Git: git://git.debian.org/git/users/pkern/aiccu.git -VCS-Browser: http://git.debian.org/?p=users/pkern/aiccu.git;a=summary Homepage: http://www.sixxs.net/tools/aiccu/ Package: aiccu Architecture: any -Depends: ${shlibs:Depends}, iputils-ping, iputils-tracepath, iproute, debconf, lsb-base +Depends: ${misc:Depends}, ${shlibs:Depends}, debconf, lsb-base, + iputils-ping [!kfreebsd-i386 !kfreebsd-amd64], + iputils-tracepath [!kfreebsd-i386 !kfreebsd-amd64], + iproute [!kfreebsd-i386 !kfreebsd-amd64], + freebsd-net-tools [kfreebsd-i386 kfreebsd-amd64] Recommends: ntpdate | ntp | time-daemon Description: SixXS Automatic IPv6 Connectivity Client Utility This client configures IPv6 connectivity without having to diff --git a/debian/patches/01_no-shipped-init-script.patch b/debian/patches/01_no-shipped-init-script.patch new file mode 100644 index 0000000..6d942c9 --- /dev/null +++ b/debian/patches/01_no-shipped-init-script.patch @@ -0,0 +1,20 @@ +We ship our own init.d script and do not want to see the upstream default +for Debian installed into DESTDIR. + +Index: aiccu-20070115/Makefile +=================================================================== +--- aiccu-20070115.orig/Makefile 2009-10-25 22:25:45.000000000 +0100 ++++ aiccu-20070115/Makefile 2009-10-25 22:25:58.000000000 +0100 +@@ -84,9 +84,9 @@ + @cp doc/README ${DESTDIR}${dirdoc} + @cp doc/LICENSE ${DESTDIR}${dirdoc} + @cp doc/HOWTO ${DESTDIR}${dirdoc} +- @echo "Installing Debian-style init.d" +- @mkdir -p ${DESTDIR}${diretc}init.d +- @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} ++# @echo "Installing Debian-style init.d" ++# @mkdir -p ${DESTDIR}${diretc}init.d ++# @cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT} + else + @echo "Installing Redhat-style init.d" + @mkdir -p ${DESTDIR}${diretc}init.d diff --git a/debian/patches/02_skip-strip.patch b/debian/patches/02_skip-strip.patch new file mode 100644 index 0000000..1873057 --- /dev/null +++ b/debian/patches/02_skip-strip.patch @@ -0,0 +1,20 @@ +We handle stripping of the binary through dh_strip, thus remove the +upstream code handling that, which does not care about our Debian +build options. + +Index: aiccu-20070115/unix-console/Makefile +=================================================================== +--- aiccu-20070115.orig/unix-console/Makefile 2009-10-25 22:31:57.000000000 +0100 ++++ aiccu-20070115/unix-console/Makefile 2009-10-25 22:32:04.000000000 +0100 +@@ -145,11 +145,6 @@ + + aiccu: $(OBJS) ${SRCS} ${INCS} + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) +-ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0) +-ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1) +- strip $@ +-endif +-endif + + clean: + $(RM) -f $(OBJS) aiccu diff --git a/debian/patches/03_no-quiet-gcc.patch b/debian/patches/03_no-quiet-gcc.patch new file mode 100644 index 0000000..27d14ad --- /dev/null +++ b/debian/patches/03_no-quiet-gcc.patch @@ -0,0 +1,16 @@ +It's better for us to see gcc output in the build log to ease debugging. +Quiet builds make that much harder. + +Index: aiccu-20070115/unix-console/Makefile +=================================================================== +--- aiccu-20070115.orig/unix-console/Makefile 2009-10-25 22:33:06.000000000 +0100 ++++ aiccu-20070115/unix-console/Makefile 2009-10-25 22:33:12.000000000 +0100 +@@ -26,7 +26,7 @@ + + #CFLAGS += $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0 + CFLAGS += $(CWARNS) -D_GNU_SOURCE +-CC = @gcc ++CC = gcc + RM = rm + + # Add -O3 when nothing is specified yet diff --git a/debian/patches/04_kfreebsd.patch b/debian/patches/04_kfreebsd.patch new file mode 100644 index 0000000..9c14122 --- /dev/null +++ b/debian/patches/04_kfreebsd.patch @@ -0,0 +1,20 @@ +Debian GNU/kFreeBSD needs Linux-like resolver libraries to be linked into +the program. Thanks to Axel Beckert . + +Index: aiccu-20070115/unix-console/Makefile +=================================================================== +--- aiccu-20070115.orig/unix-console/Makefile 2009-10-24 17:26:43.664837919 +0200 ++++ aiccu-20070115/unix-console/Makefile 2009-10-24 17:27:05.749331932 +0200 +@@ -68,6 +68,12 @@ + SRCS += ../common/aiccu_kame.c + OBJS += ../common/aiccu_kame.o + endif ++ ++# GNU/kFreeBSD ++ifeq ($(shell uname | grep -c "kFreeBSD"),1) ++LDFLAGS += -lpthread -lresolv ++endif ++ + endif + + # DragonFlyBSD diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..2de84fb --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +01_no-shipped-init-script.patch +02_skip-strip.patch +03_no-quiet-gcc.patch +04_kfreebsd.patch diff --git a/debian/po/ru.po b/debian/po/ru.po new file mode 100644 index 0000000..bc00182 --- /dev/null +++ b/debian/po/ru.po @@ -0,0 +1,131 @@ +# translation of aiccu_20070115-9_ru.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Kozlov , 2009. +msgid "" +msgstr "" +"Project-Id-Version: aiccu 20070115-9\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-18 04:31+0200\n" +"PO-Revision-Date: 2009-08-26 19:24+0400\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Aiccu username:" +msgstr "Имя пользователя для aiccu:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"To successfully connect, you must provide your SixXS username. This is the " +"same username you use to login to the sixxs.net web site." +msgstr "" +"Для подключения требуется указать имя пользователя в SixXS. Это " +"то же самое имя пользователя, которым вы входите на веб-сайт " +"sixxs.net." + +#. Type: password +#. Description +#: ../templates:3001 +msgid "Aiccu password:" +msgstr "Пароль к aiccu:" + +#. Type: password +#. Description +#: ../templates:3001 +msgid "" +"To successfully connect, you must provide your SixXS password. This is the " +"same password you use to login to the sixxs.net web site." +msgstr "" +"Для подключения требуется указать пароль в SixXS. Это " +"тот же самый пароль, который вы используете на веб-сайте " +"sixxs.net." + +#. Type: select +#. Description +#: ../templates:4001 +msgid "Tunnel broker:" +msgstr "Туннель-брокер:" + +#. Type: select +#. Description +#: ../templates:4001 +msgid "Please select the tunnel broker you would like to use." +msgstr "Укажите туннель-брокер, который хотите использовать." + +#. Type: select +#. Description +#: ../templates:5001 +msgid "Tunnel name:" +msgstr "Имя туннеля:" + +#. Type: select +#. Description +#: ../templates:5001 +msgid "" +"If more than one tunnel is configured for your account, please specify which " +"one should be automatically activated." +msgstr "" +"Если для учётной записи настроено более одного туннеля, то укажите " +"какой из них должен активироваться автоматически." + +#. Type: boolean +#. Description +#: ../templates:6001 +msgid "Re-check authentication details?" +msgstr "Перепроверить данные аутентификации?" + +#. Type: boolean +#. Description +#: ../templates:6001 +msgid "" +"The authentication details you specified appear to be incorrect. You should " +"try to log in on the tunnel broker website and contact the site " +"administrators." +msgstr "" +"Указанные вами данные аутентификации, кажется, неверны. " +"Попробуйте войти на веб-сайт туннель-брокера и связаться с " +"администратором." + +#. Type: error +#. Description +#: ../templates:7001 +msgid "No tunnel brokers available" +msgstr "Нет доступных туннель-брокеров" + +#. Type: error +#. Description +#: ../templates:7001 +msgid "" +"No tunnel brokers could be retrieved from DNS (_aiccu + _aiccu.sixxs.net). " +"This most likely indicates a DNS configuration problem." +msgstr "" +"Невозможно получить туннель-брокеры из DNS (_aiccu + _aiccu.sixxs.net). " +"Обычно это указывает на проблему в настройках DNS." + +#. Type: error +#. Description +#: ../templates:8001 +msgid "No tunnels available" +msgstr "Нет доступных туннелей" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "" +"No tunnels are currently available to you. Please connect to the SixXS " +"website at http://www.sixxs.net/ to request a tunnel for your account." +msgstr "" +"К вам нет, в данный момент, доступных туннелей. Войдите на веб-сайт SixXS " +"http://www.sixxs.net/ и запросите туннель для вашей учётной записи." + diff --git a/debian/po/sv.po b/debian/po/sv.po new file mode 100644 index 0000000..44dc230 --- /dev/null +++ b/debian/po/sv.po @@ -0,0 +1,126 @@ +# Swedish debconf translation of aicc +# Copyright (C) 2009 Martin Bagge +# This file is distributed under the same license as the aicc package. +# Martin Bagge , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: aiccu\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-07-18 04:31+0200\n" +"PO-Revision-Date: 2009-01-04 21:25+0100\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Swedish\n" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Aiccu username:" +msgstr "Användarnamn:" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "" +"To successfully connect, you must provide your SixXS username. This is the " +"same username you use to login to the sixxs.net web site." +msgstr "" +"För att kunna ansluta måste du ange ditt SixXS-användarnamn. Det är samma " +"användarnamn som du använder för att logga in på webbplatsen sixxs.net." + +#. Type: password +#. Description +#: ../templates:3001 +msgid "Aiccu password:" +msgstr "Lösenord:" + +#. Type: password +#. Description +#: ../templates:3001 +msgid "" +"To successfully connect, you must provide your SixXS password. This is the " +"same password you use to login to the sixxs.net web site." +msgstr "" +"För att kunna ansluta måste du ange ditt SixXS-lösenord. Det är samma " +"lösenord som du använder för att logga in på webbplatsen sixxs.net." + +#. Type: select +#. Description +#: ../templates:4001 +msgid "Tunnel broker:" +msgstr "Tunnelhanterare:" + +#. Type: select +#. Description +#: ../templates:4001 +msgid "Please select the tunnel broker you would like to use." +msgstr "Välj vilken tunnelhanterare du vill använda." + +#. Type: select +#. Description +#: ../templates:5001 +msgid "Tunnel name:" +msgstr "Tunnelnamn:" + +#. Type: select +#. Description +#: ../templates:5001 +msgid "" +"If more than one tunnel is configured for your account, please specify which " +"one should be automatically activated." +msgstr "" +"Om det finns mer än en tunnel för ditt konto måste du välja vilken som ska " +"aktiveras automatiskt." + +#. Type: boolean +#. Description +#: ../templates:6001 +msgid "Re-check authentication details?" +msgstr "Kontrollera identitetsinställningarna igen?" + +#. Type: boolean +#. Description +#: ../templates:6001 +msgid "" +"The authentication details you specified appear to be incorrect. You should " +"try to log in on the tunnel broker website and contact the site " +"administrators." +msgstr "" +"Identitetsinställningarna som du angav verkar inte fungera. Du bör logga in " +"på webbplatsen för tunnelhanteringen och kontakta en administratör." + +#. Type: error +#. Description +#: ../templates:7001 +msgid "No tunnel brokers available" +msgstr "Inga tunnelhanterar tillgängliga." + +#. Type: error +#. Description +#: ../templates:7001 +msgid "" +"No tunnel brokers could be retrieved from DNS (_aiccu + _aiccu.sixxs.net). " +"This most likely indicates a DNS configuration problem." +msgstr "" +"Kunde inte hämta tunnelhanterare från DNS (_aiccu+ aiccu.sixxss.net). Detta " +"tyder på att DNS-inställningarna är felaktiga." + +#. Type: error +#. Description +#: ../templates:8001 +msgid "No tunnels available" +msgstr "Inga tunnlar tillgängliga" + +#. Type: error +#. Description +#: ../templates:8001 +msgid "" +"No tunnels are currently available to you. Please connect to the SixXS " +"website at http://www.sixxs.net/ to request a tunnel for your account." +msgstr "" +"Det finns för tillfället inga tunnlar tillgängliga för dig. Anslut till " +"SixXS webbplats på http://www.sixxs.net och begär en tunnel för ditt konto." diff --git a/debian/rules b/debian/rules index 9b09ed3..788f8d1 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/quilt/quilt.make + configure: configure-stamp configure-stamp: dh_testdir @@ -14,12 +16,12 @@ configure-stamp: build: build-stamp -build-stamp: configure-stamp +build-stamp: $(QUILT_STAMPFN) configure-stamp dh_testdir $(MAKE) touch build-stamp -clean: +clean: unpatch dh_testdir rm -f build-stamp configure-stamp diff --git a/unix-console/Makefile b/unix-console/Makefile index f746cac..d5e5c07 100755 --- a/unix-console/Makefile +++ b/unix-console/Makefile @@ -145,6 +145,11 @@ all: aiccu aiccu: $(OBJS) ${SRCS} ${INCS} $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) +ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0) +ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1) + strip $@ +endif +endif clean: $(RM) -f $(OBJS) aiccu -- 2.11.4.GIT