tag 667755 + pending tag 670971 + pending kthxbye Hi,
Axel Beckert wrote: > I'm currently preparing an NMU to fix this issue. (Will also include > the Danish debconf templates from http://bugs.debian.org/670971.) NMU uploaded to DELAYED/6 and pushed to https://github.com/xtaran/aiccu Please tell me if I should delay it longer. debdiff attached or online at https://github.com/rhaasjes/aiccu/pull/1/files Regards, Axel -- ,''`. | Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE `- | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5
diff -Nru aiccu-20070115/debian/changelog aiccu-20070115/debian/changelog --- aiccu-20070115/debian/changelog 2012-03-26 13:14:04.000000000 +0200 +++ aiccu-20070115/debian/changelog 2012-07-01 00:07:21.000000000 +0200 @@ -1,3 +1,14 @@ +aiccu (20070115-15.1) unstable; urgency=low + + * Non-maintainer upload + * Remove quilt usage from source format 3.0 package. Fixes FTBFS on + kfreebsd. (Closes: #667755) + + Remove no more needed build-dependency on quilt and README.source + * Add Danish translation of debconf templates by Joe Hansen (Closes: + #670971) + + -- Axel Beckert <a...@debian.org> Sun, 01 Jul 2012 00:06:34 +0200 + aiccu (20070115-15) unstable; urgency=low * Upgraded standards-version to 3.9.3 diff -Nru aiccu-20070115/debian/control aiccu-20070115/debian/control --- aiccu-20070115/debian/control 2012-03-26 13:14:04.000000000 +0200 +++ aiccu-20070115/debian/control 2012-06-30 23:49:30.000000000 +0200 @@ -2,7 +2,7 @@ Section: net Priority: optional Maintainer: Reinier Haasjes <rein...@haasjes.com> -Build-Depends: debhelper (>= 7), po-debconf, libgnutls-dev, docbook-to-man, quilt +Build-Depends: debhelper (>= 7), po-debconf, libgnutls-dev, docbook-to-man Standards-Version: 3.9.3 Homepage: http://www.sixxs.net/tools/aiccu/ Vcs-Browser: http://github.com/rhaasjes/aiccu diff -Nru aiccu-20070115/debian/po/da.po aiccu-20070115/debian/po/da.po --- aiccu-20070115/debian/po/da.po 1970-01-01 01:00:00.000000000 +0100 +++ aiccu-20070115/debian/po/da.po 2012-07-01 00:01:32.000000000 +0200 @@ -0,0 +1,79 @@ +# Danish translation aiccu. +# Copyright (C) 2012 aiccu & nedenstående oversættere. +# This file is distributed under the same license as the aiccu package. +# Joe Hansen <joedalt...@yahoo.dk>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: aiccu\n" +"Report-Msgid-Bugs-To: ai...@packages.debian.org\n" +"POT-Creation-Date: 2010-01-06 11:07+0100\n" +"PO-Revision-Date: 2012-04-30 19:21+0100\n" +"Last-Translator: Joe Hansen <joedalt...@yahoo.dk>\n" +"Language-Team: Danish <debian-l10n-dan...@lists.debian.org>\n" +"Language: da\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../templates:2001 +msgid "Aiccu username:" +msgstr "Brugernavn for 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 "" +"For at forbinde skal du angive dit SixXS-brugernavn. Det er det samme " +"brugernavn, som du bruger til at logge ind på hjemmesiden sixxs.net." + +#. Type: password +#. Description +#: ../templates:3001 +msgid "Aiccu password:" +msgstr "Adgangskode for 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 "" +"For at forbinde skal du angive din SixXS-adgangskode. Det er den samme " +"adgangskode, som du bruger til at logge ind på hjemmesiden sixxs.net." + +#. Type: select +#. Description +#: ../templates:4001 +msgid "Tunnel broker:" +msgstr "Tunnelforhandler:" + +#. Type: select +#. Description +#: ../templates:4001 +msgid "Please select the tunnel broker you would like to use." +msgstr "Vælg venligst tunnelforhandleren du ønsker at bruge." + +#. Type: select +#. Description +#: ../templates:5001 +msgid "Tunnel name:" +msgstr "Tunnelnavn:" + +#. 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 "" +"Hvis mere end en tunnel er konfigureret for din konto, så angiv venligst " +"hvilken som automatisk skal aktiveres." + + diff -Nru aiccu-20070115/debian/README.source aiccu-20070115/debian/README.source --- aiccu-20070115/debian/README.source 2012-03-26 13:14:04.000000000 +0200 +++ aiccu-20070115/debian/README.source 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -To configure quilt to use debian/patches instead of patches, you want -either to export QUILT_PATCHES=debian/patches in your environment -or use this snippet in your ~/.quiltrc: - - for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do - if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then - export QUILT_PATCHES=debian/patches - break - fi - done - -To get the fully patched source after unpacking the source package, cd to -the root level of the source package and run: - - quilt push -a - -The last patch listed in debian/patches/series will become the current -patch. - -To add a new set of changes, first run quilt push -a, and then run: - - quilt new <patch> - -where <patch> is a descriptive name for the patch, used as the filename in -debian/patches. Then, for every file that will be modified by this patch, -run: - - quilt add <file> - -before editing those files. You must tell quilt with quilt add what files -will be part of the patch before making changes or quilt will not work -properly. After editing the files, run: - - quilt refresh - -to save the results as a patch. - -Alternately, if you already have an external patch and you just want to -add it to the build system, run quilt push -a and then: - - quilt import -P <patch> /path/to/patch - quilt push -a - -(add -p 0 to quilt import if needed). <patch> as above is the filename to -use in debian/patches. The last quilt push -a will apply the patch to -make sure it works properly. - -To remove an existing patch from the list of patches that will be applied, -run: - - quilt delete <patch> - -You may need to run quilt pop -a to unapply patches first before running -this command. diff -Nru aiccu-20070115/debian/rules aiccu-20070115/debian/rules --- aiccu-20070115/debian/rules 2012-03-26 13:14:04.000000000 +0200 +++ aiccu-20070115/debian/rules 2012-06-30 23:59:34.000000000 +0200 @@ -16,15 +16,13 @@ RPM_OPT_FLAGS = $(CFLAGS) export RPM_OPT_FLAGS -include /usr/share/quilt/quilt.make - %: dh $@ -build: $(QUILT_STAMPFN) +build: dh $@ -clean: unpatch +clean: dh $@ # dh_testdir # rm -f build-stamp configure-stamp
