[Debian-l10n-commits] poedit branch master updated. upstream/1.6.9-52-gac1d43f

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "poedit".

The branch, master has been updated
       via  ac1d43fd64bb3f8b2dd03e3839ee2a9406492962 (commit)
       via  d2d3bc4615c4fe13fcaa0d55b0fc4972b4d4e805 (commit)
       via  a2da550d012eb6f3e847ede9ee1353424b88a73c (commit)
      from  dbeb0f909dcc1e9ff04eb2b58855c28894cbe87b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------

http://anonscm.debian.org/gitweb/?p=debian-l10n/poedit.git;a=commitdiff;h=ac1d43fd64bb3f8b2dd03e3839ee2a9406492962

commit ac1d43fd64bb3f8b2dd03e3839ee2a9406492962
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Sep 12 17:05:27 2014 +0200

    add DH_VERBOSE


http://anonscm.debian.org/gitweb/?p=debian-l10n/poedit.git;a=commitdiff;h=d2d3bc4615c4fe13fcaa0d55b0fc4972b4d4e805

commit d2d3bc4615c4fe13fcaa0d55b0fc4972b4d4e805
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Sep 12 16:30:03 2014 +0200

    Remove old patch and source/options


http://anonscm.debian.org/gitweb/?p=debian-l10n/poedit.git;a=commitdiff;h=a2da550d012eb6f3e847ede9ee1353424b88a73c

commit a2da550d012eb6f3e847ede9ee1353424b88a73c
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Sep 12 16:27:51 2014 +0200

    Ignoring autogenerated files

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                   |  5 +++++
 debian/patches/03-add-desktop-keywords.patch | 14 --------------
 debian/rules                                 |  4 +++-
 debian/source/options                        |  1 -
 4 files changed, 8 insertions(+), 16 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 debian/patches/03-add-desktop-keywords.patch
 delete mode 100644 debian/source/options

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..039f941
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+Makefile.in
+admin/depcomp
+admin/install-sh
+admin/missing
+configure
diff --git a/debian/patches/03-add-desktop-keywords.patch b/debian/patches/03-add-desktop-keywords.patch
deleted file mode 100644
index ca81950..0000000
--- a/debian/patches/03-add-desktop-keywords.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Andreas Rönnquist
-Description: Fix lintian warning desktop-entry-lacks-keywords-entry
- Fixes lintian warning by adding some keywords to the desktop file, see
- http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html#key-keywords
- for more information and upstream ticket at
- http://www.poedit.net/trac/ticket/540
- Applied upstream, but after the 1.5.7 release.
---- a/poedit.desktop
-+++ b/poedit.desktop
-@@ -29,3 +29,4 @@
- Type=Application
- Categories=Development;Translation;
- StartupNotify=true
-+Keywords=Translate;po;gettext;
diff --git a/debian/rules b/debian/rules
index d496f93..7b585b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,13 @@
 #!/usr/bin/make -f
 
+#export DH_VERBOSE=1
+
 # Disable WXDEBUG assertions (avoiding e.g. https://bugs.debian.org/754205) -
 # with -DNDEBUG these are quietly dealt with like they were with wx2.8.
 export DEB_CPPFLAGS_MAINT_APPEND := -DNDEBUG
 
 %:
-	dh $@ --with autoreconf,autotools_dev
+	dh $@ --with autotools_dev,autoreconf
 
 override_dh_auto_configure:
 	./bootstrap
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index 01ebd96..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-extend-diff-ignore = "src/compiled_xrc\.cpp$"
-----------------------------------------------------------------------


hooks/post-receive
-- 
poedit