[Python-apps-commits] r3388 - in packages/txt2tags/trunk (8 files)
jmw-guest at users.alioth.debian.org
jmw-guest at users.alioth.debian.org
Thu Aug 6 22:39:55 UTC 2009
Date: Thursday, August 6, 2009 @ 22:39:54
Author: jmw-guest
Revision: 3388
Merge (most) of 2.5-1 from Eder L. Marques
Modified:
packages/txt2tags/trunk/debian/changelog
packages/txt2tags/trunk/debian/compat
packages/txt2tags/trunk/debian/control
packages/txt2tags/trunk/debian/dirs
packages/txt2tags/trunk/debian/docs
packages/txt2tags/trunk/debian/rules
packages/txt2tags/trunk/debian/watch
packages/txt2tags/trunk/po/Makefile
Modified: packages/txt2tags/trunk/debian/changelog
===================================================================
--- packages/txt2tags/trunk/debian/changelog 2009-08-06 22:07:49 UTC (rev 3387)
+++ packages/txt2tags/trunk/debian/changelog 2009-08-06 22:39:54 UTC (rev 3388)
@@ -1,3 +1,29 @@
+txt2tags (2.5-1) UNRELEASED; urgency=low
+
+ [ Eder L. Marques ]
+ * New upstream release. Closes: #434547, #451341, #492668,
+ #290806, #290928.
+ * debian/control:
+ - Bump Standards-Version to 3.8.0 (without modifications).
+ - New short description. Closes: #466632.
+ - Updated long description.
+ - Changed section to misc.
+ - Updated build-depends.
+ * debian/compat:
+ - Changed to version 7.
+ * debian/copyright:
+ - Inserted the new maintainer.
+ * debian/watch:
+ - Updated to version 3.
+ * debian/docs:
+ - Removed obsolete entries.
+ * debian/README.Debian:
+ - Inserted the new maintainer.
+ * txt2tags-2.3/po/Makefile:
+ - Added new catalogs.
+
+ -- Eder L. Marques <eder at edermarques.net> Tue, 05 Aug 2008 15:20:09 -0300
+
txt2tags (2.3-1) unstable; urgency=low
* New upstream release (Closes: #290800)
@@ -10,7 +36,7 @@
* debian/Readme.Debian: note about GUI
* doc/manpage.man: right options preproc/postproc now (Closes: #364911)
* po/Makefile: added, to build .mo files
-
+
-- Christian Surchi <csurchi at debian.org> Mon, 24 Jul 2006 01:16:08 +0200
txt2tags (2.0-1) unstable; urgency=low
@@ -35,4 +61,3 @@
* Initial Release. Let's close ITP bug (Closes: #144507).
-- Christian Surchi <csurchi at debian.org> Sun, 17 Aug 2003 15:42:25 +0200
-
Modified: packages/txt2tags/trunk/debian/compat
===================================================================
--- packages/txt2tags/trunk/debian/compat 2009-08-06 22:07:49 UTC (rev 3387)
+++ packages/txt2tags/trunk/debian/compat 2009-08-06 22:39:54 UTC (rev 3388)
@@ -1 +1 @@
-4
+7
Modified: packages/txt2tags/trunk/debian/control
===================================================================
--- packages/txt2tags/trunk/debian/control 2009-08-06 22:07:49 UTC (rev 3387)
+++ packages/txt2tags/trunk/debian/control 2009-08-06 22:39:54 UTC (rev 3388)
@@ -1,26 +1,28 @@
Source: txt2tags
-Section: text
+Section: misc
Priority: optional
Maintainer: Christian Surchi <csurchi at debian.org>
-Build-Depends: debhelper (>> 4.0.0), gettext
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7)
+Build-Depends-Indep: gettext
+Standards-Version: 3.8.0
+Homepage: http://txt2tags.sourceforge.net/
Package: txt2tags
Architecture: all
Depends: python
Suggests: python-tk
-Description: a conversion tool generating HTML/SGML/LaTeX/man/MoinMoin/mgp/PageMaker files
- txt2tags is a format conversion tool written in Python that
- generates HTML, SGML, LaTeX, man page, MoinMoin, Magic Point and
- PageMaker documents from a plain text file with little marks.
+Description: conversion tool to generating several file formats
+ txt2tags is a document generator written in Python that
+ generates HTML, XHTML, SGML, LaTeX, Lout, man page, Wikipedia,
+ Google Code Wiki, DokuWiki, MoinMoin, Magic Point and PageMaker
+ documents from a plain text file with little marks.
.
Different from other conversion tools, it is generic, and not
target-specific (as a txt2html tool). This way, you can keep just
one source text file and one tool for all your formatting needs.
.
- Supports header, title, bold/italic/underline, preformatted,
+ Supports header, title, bold/italic/underline/strike, preformatted,
quote, link, lists, bar, image and table.
.
With txt2tags, you focuses your mind on the document CONTENT, and
forget about formatting. Just let the program do this dirty job.
-
Modified: packages/txt2tags/trunk/debian/dirs
===================================================================
--- packages/txt2tags/trunk/debian/dirs 2009-08-06 22:07:49 UTC (rev 3387)
+++ packages/txt2tags/trunk/debian/dirs 2009-08-06 22:39:54 UTC (rev 3388)
@@ -1 +1,2 @@
-/usr/bin
+usr/bin
+usr/share/man/man1
Modified: packages/txt2tags/trunk/debian/docs
===================================================================
--- packages/txt2tags/trunk/debian/docs 2009-08-06 22:07:49 UTC (rev 3387)
+++ packages/txt2tags/trunk/debian/docs 2009-08-06 22:39:54 UTC (rev 3388)
@@ -1,6 +1,3 @@
README
-README-FIRST
-TEAM
TODO
-extras/
doc/
Modified: packages/txt2tags/trunk/debian/rules
===================================================================
--- packages/txt2tags/trunk/debian/rules 2009-08-06 22:07:49 UTC (rev 3387)
+++ packages/txt2tags/trunk/debian/rules 2009-08-06 22:39:54 UTC (rev 3388)
@@ -1,101 +1,42 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
+# -*- makefile -*-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
+clean:
dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- #$(MAKE)
- #/usr/bin/docbook-to-man debian/txt2tags.sgml > txt2tags.1
-
- touch build-stamp
-
-clean:
- dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
- #-$(MAKE) clean
rm -f po/*.mo
rm -f txt2tags.1
-
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
+ install -o root -m 755 "txt2tags" "debian/txt2tags/usr/bin/txt2tags"
+ cd po && $(MAKE) install BASEDIR=$(CURDIR)/debian/txt2tags
+ cp doc/manpage.man txt2tags.1
- # Add here commands to install the package into debian/txt2tags.
- #$(MAKE) install DESTDIR=$(CURDIR)/debian/txt2tags
- install txt2tags $(CURDIR)/debian/txt2tags/usr/bin/txt2tags
# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
+binary-indep: install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- cd po && $(MAKE) install BASEDIR=$(CURDIR)/debian/txt2tags
- cp doc/manpage.man txt2tags.1
dh_installman txt2tags.1
- dh_link
- dh_strip
dh_compress
dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
-binary: binary-indep binary-arch
+binary: binary-indep
.PHONY: build clean binary-indep binary-arch binary install configure
Modified: packages/txt2tags/trunk/debian/watch
===================================================================
--- packages/txt2tags/trunk/debian/watch 2009-08-06 22:07:49 UTC (rev 3387)
+++ packages/txt2tags/trunk/debian/watch 2009-08-06 22:39:54 UTC (rev 3388)
@@ -1,6 +1,4 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site Directory Pattern Version Script
-version=2
+# Compulsory line, this is a version 3 file
+version=3
+
http://txt2tags.sourceforge.net/src/txt2tags-(.*)\.tgz
Modified: packages/txt2tags/trunk/po/Makefile
===================================================================
--- packages/txt2tags/trunk/po/Makefile 2009-08-06 22:07:49 UTC (rev 3387)
+++ packages/txt2tags/trunk/po/Makefile 2009-08-06 22:39:54 UTC (rev 3388)
@@ -3,8 +3,7 @@
PACKAGE = txt2tags
-CATALOGS = de.mo es.mo fr.mo hu.mo it.mo pt_BR.mo
-
+CATALOGS = de.po es.po fi.po fr.po hu.po it.po pt_BR.po zh_CN.po
%.mo: %.po
msgfmt --statistics --check --verbose --output-file=$@ $<
@@ -15,9 +14,8 @@
install: $(CATALOGS)
for n in $(CATALOGS); do \
- l=`basename $$n .mo`; \
+ l=`basename $$n .po`; \
$(INSTALL) -m 755 -d $(INSTALLNLSDIR)/$$l; \
$(INSTALL) -m 755 -d $(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
$(INSTALL) -m 644 $$n $(INSTALLNLSDIR)/$$l/LC_MESSAGES/$(PACKAGE).mo; \
done
-
More information about the Python-apps-commits
mailing list