[DebianBRTeam-commits] r622 - in /packages/gconjugue/trunk/debian: changelog compat control copyright patches/ patches/Makefile.in.patch patches/POTFILES.skip.patch patches/conjugue.c.patch patches/series rules source/ source/format watch

eriberto-guest at users.alioth.debian.org eriberto-guest at users.alioth.debian.org
Tue Apr 30 21:15:39 UTC 2013 

Author: eriberto-guest
Date: Tue Apr 30 21:15:38 2013
New Revision: 622

URL: http://svn.debian.org/wsvn/?sc=1&rev=622
Log:
  * New upstream release.
  * Bump debhelper compat level to 9.
  * Migrated debian format from 1.0 to 3.0.
  * debian/control:
      - Added ${misc:Depends} to Depends field.
      - Bump Standards-Version to 3.9.4.
      - Updated Build-Depends field:
          . added dpkg-dev, intltool and pkg-config.
          . upstream uses libgtk-3 now.
      - Updated Homepage field.
  * debian/copyright:
      - Updated to new format.
      - Updated years (upstream and Debian package).
  * debian/patches:
      - Added patch conjugue.c.patch that fix FTBFS.
        Thanks to Michael Biebl <biebl at debian.org>. (Closes: #665527)
      - Added patch Makefile.in.patch.
      - Added patch POTFILES.skip.patch.
  * debian/rules: updated to new (reduced) format.
  * debian/watch: updated to find newest versions.

Added:
    packages/gconjugue/trunk/debian/patches/
    packages/gconjugue/trunk/debian/patches/Makefile.in.patch
    packages/gconjugue/trunk/debian/patches/POTFILES.skip.patch
    packages/gconjugue/trunk/debian/patches/conjugue.c.patch
    packages/gconjugue/trunk/debian/patches/series
    packages/gconjugue/trunk/debian/source/
    packages/gconjugue/trunk/debian/source/format
Modified:
    packages/gconjugue/trunk/debian/changelog
    packages/gconjugue/trunk/debian/compat
    packages/gconjugue/trunk/debian/control
    packages/gconjugue/trunk/debian/copyright
    packages/gconjugue/trunk/debian/rules
    packages/gconjugue/trunk/debian/watch

Modified: packages/gconjugue/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/changelog?rev=622&op=diff
==============================================================================
--- packages/gconjugue/trunk/debian/changelog (original)
+++ packages/gconjugue/trunk/debian/changelog Tue Apr 30 21:15:38 2013
@@ -1,3 +1,28 @@
+gconjugue (0.7.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump debhelper compat level to 9.
+  * Migrated debian format from 1.0 to 3.0.
+  * debian/control:
+      - Added ${misc:Depends} to Depends field.
+      - Bump Standards-Version to 3.9.4.
+      - Updated Build-Depends field:
+          . added dpkg-dev, intltool and pkg-config.
+          . upstream uses libgtk-3 now.
+      - Updated Homepage field.
+  * debian/copyright:
+      - Updated to new format.
+      - Updated years (upstream and Debian package).
+  * debian/patches:
+      - Added patch conjugue.c.patch that fix FTBFS.
+        Thanks to Michael Biebl <biebl at debian.org>. (Closes: #665527)
+      - Added patch Makefile.in.patch.
+      - Added patch POTFILES.skip.patch.
+  * debian/rules: updated to new (reduced) format.
+  * debian/watch: updated to find newest versions.
+
+ -- Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>  Thu, 25 Apr 2013 17:14:04 -0300
+
 gconjugue (0.7.2-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/gconjugue/trunk/debian/compat
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/compat?rev=622&op=diff
==============================================================================
--- packages/gconjugue/trunk/debian/compat (original)
+++ packages/gconjugue/trunk/debian/compat Tue Apr 30 21:15:38 2013
@@ -1,1 +1,1 @@
-7
+9

Modified: packages/gconjugue/trunk/debian/control
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/control?rev=622&op=diff
==============================================================================
--- packages/gconjugue/trunk/debian/control (original)
+++ packages/gconjugue/trunk/debian/control Tue Apr 30 21:15:38 2013
@@ -3,17 +3,18 @@
 Priority: optional
 Maintainer: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
 Uploaders: Jakson Alves de Aquino <jalvesaq at gmail.com>
-Build-Depends: debhelper (>= 7), autotools-dev, pkg-config, libgtk2.0-dev
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 9), autotools-dev, dpkg-dev (>= 1.16.1~),
+               intltool, pkg-config, libgtk-3-dev
+Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/svn/debian-br-team/packages/gconjugue
 Vcs-Browser: http://svn.debian.org/wsvn/debian-br-team/packages/gconjugue
-Homepage: http://jalvesaq.googlepages.com/gconjugue.en.html
+Homepage: https://sites.google.com/site/jalvesaq/gconjugue
 
 Package: gconjugue
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: gtk program to conjugate Brazilian verbs
  Graphical program, based in conjugue (package brazilian-conjugate), to
  conjugate Portuguese verbs as spoken in Brazil.
  .
- Screenshot: http://www.eriberto.pro.br/debian/screenshots/gconjugue.jpg
+ Screenshot: http://eriberto.pro.br/debian/screenshots/gconjugue.jpg

Modified: packages/gconjugue/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/copyright?rev=622&op=diff
==============================================================================
--- packages/gconjugue/trunk/debian/copyright (original)
+++ packages/gconjugue/trunk/debian/copyright Tue Apr 30 21:15:38 2013
@@ -1,29 +1,28 @@
-This package was debianized by Joao Eriberto Mota Filho
-<eriberto at eriberto.pro.br> on Wed, 31 Oct 2007 18:25:40 -0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gconjugue
+Source: https://sites.google.com/site/jalvesaq/gconjugue
 
-It was downloaded from http://jalvesaq.googlepages.com/gconjugue.en.html
+Files: *
+Copyright: 2005-2011 Jakson Alves de Aquino <jalvesaq at gmail.com>
+License: GPL-3.0+
 
-Upstream Author: Jakson Alves de Aquino <jalvesaq at gmail.com>
+Files: debian/*
+Copyright: 2007-2013 Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
+License: GPL-3.0+
 
-Copyright: (C) 2005-2009 Jakson Alves de Aquino.
-
-License:
-
-    This package is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/' directory.
-
-The Debian packaging is Copyright 2007-2009, Joao Eriberto Mota Filho
-<eriberto at eriberto.pro.br> and is licensed under the GPL 2 or later.
+License: GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

Added: packages/gconjugue/trunk/debian/patches/Makefile.in.patch
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/patches/Makefile.in.patch?rev=622&op=file
==============================================================================
--- packages/gconjugue/trunk/debian/patches/Makefile.in.patch (added)
+++ packages/gconjugue/trunk/debian/patches/Makefile.in.patch Tue Apr 30 21:15:38 2013
@@ -1,0 +1,21 @@
+Description: * Moves the docs from usr/doc to usr/share/doc.
+             * Prevents two changelogs.
+             * Avoids COPYING copy.
+Author: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
+Last-Update: 20130430
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -280,11 +280,9 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = src po
+-gconjuguedocdir = ${prefix}/doc/gconjugue
++gconjuguedocdir = ${prefix}/share/doc/gconjugue
+ gconjuguedoc_DATA = \
+-	README\
+-	COPYING\
+-	ChangeLog
++	README
+ 
+ man_MANS = data/gconjugue.1
+ desktopdir = $(datadir)/applications

Added: packages/gconjugue/trunk/debian/patches/POTFILES.skip.patch
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/patches/POTFILES.skip.patch?rev=622&op=file
==============================================================================
--- packages/gconjugue/trunk/debian/patches/POTFILES.skip.patch (added)
+++ packages/gconjugue/trunk/debian/patches/POTFILES.skip.patch Tue Apr 30 21:15:38 2013
@@ -1,0 +1,7 @@
+Description: creates po/POTFILES.skip.
+Author: Joao Eriberto Mota Filho <eriberto at eriberto.pro.br>
+Last-Update: 2013-04-30
+--- /dev/null
++++ b/po/POTFILES.skip
+@@ -0,0 +1 @@
++src/conjugue.c

Added: packages/gconjugue/trunk/debian/patches/conjugue.c.patch
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/patches/conjugue.c.patch?rev=622&op=file
==============================================================================
--- packages/gconjugue/trunk/debian/patches/conjugue.c.patch (added)
+++ packages/gconjugue/trunk/debian/patches/conjugue.c.patch Tue Apr 30 21:15:38 2013
@@ -1,0 +1,14 @@
+Description: changes src/conjugue.c to avoid FTBFS on Debian.
+Author: Michael Biebl <biebl at debian.org>
+Last-Update: 2012-12-16 (#665527)
+--- a/src/conjugue.c
++++ b/src/conjugue.c
+@@ -11,7 +11,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdarg.h>
+-#include <glib/gunicode.h>
++#include <glib.h>
+ 
+ #include "conjugue.h"
+ 

Added: packages/gconjugue/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/patches/series?rev=622&op=file
==============================================================================
--- packages/gconjugue/trunk/debian/patches/series (added)
+++ packages/gconjugue/trunk/debian/patches/series Tue Apr 30 21:15:38 2013
@@ -1,0 +1,3 @@
+Makefile.in.patch
+POTFILES.skip.patch
+conjugue.c.patch

Modified: packages/gconjugue/trunk/debian/rules
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/rules?rev=622&op=diff
==============================================================================
--- packages/gconjugue/trunk/debian/rules (original)
+++ packages/gconjugue/trunk/debian/rules Tue Apr 30 21:15:38 2013
@@ -3,64 +3,14 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-confflags = --build=$(DEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --host=$(DEB_HOST_GNU_TYPE)
-endif
+# HARDENING in GCC (needed to use LDFLAGS below)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
-config.status: configure
-	dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure $(confflags) --prefix=$(DESTDIR)/usr --mandir=\$${prefix}/share/man CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+# Avoids warnings from dpkg-shlibdeps
+# (package could avoid a useless dependency...)
+	LDFLAGS += -Wl,--as-needed
 
-build: build-stamp
-
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	if [ -f Makefile ]; then $(MAKE) distclean; fi
-	rm -f config.sub config.guess
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	$(MAKE) DESTDIR=$(CURDIR)/debian/gconjugue  install
-	rm -f $(CURDIR)/debian/gconjugue/usr/share/doc/gconjugue/COPYING
-	rm -f $(CURDIR)/debian/gconjugue/usr/share/doc/gconjugue/ChangeLog
-
-binary: binary-arch
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep:
-
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+	dh $@ --parallel

Added: packages/gconjugue/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/source/format?rev=622&op=file
==============================================================================
--- packages/gconjugue/trunk/debian/source/format (added)
+++ packages/gconjugue/trunk/debian/source/format Tue Apr 30 21:15:38 2013
@@ -1,0 +1,1 @@
+3.0 (quilt)

Modified: packages/gconjugue/trunk/debian/watch
URL: http://svn.debian.org/wsvn/packages/gconjugue/trunk/debian/watch?rev=622&op=diff
==============================================================================
--- packages/gconjugue/trunk/debian/watch (original)
+++ packages/gconjugue/trunk/debian/watch Tue Apr 30 21:15:38 2013
@@ -1,2 +1,2 @@
 version=3
-http://jalvesaq.googlepages.com/gconjugue.en.html gconjugue-(.*)\.tar\.gz
+http://jalvesaq.googlepages.com/gconjugue /site/jalvesaq/gconjugue/gconjugue-(.*)\.tar\.gz\?attredirects=0\&amp\;d=1

More information about the debian-br-team-commits mailing list