r14290 - in packages/trunk/gnomekiss/debian: . patches source

Barry deFreese bdefreese at alioth.debian.org
Fri Jun 21 18:50:03 UTC 2013


Author: bdefreese
Date: 2013-06-21 18:50:03 +0000 (Fri, 21 Jun 2013)
New Revision: 14290

Added:
   packages/trunk/gnomekiss/debian/gnomekiss.install
   packages/trunk/gnomekiss/debian/patches/020_gtkspinbutton.patch
   packages/trunk/gnomekiss/debian/source/
   packages/trunk/gnomekiss/debian/source/format
Modified:
   packages/trunk/gnomekiss/debian/changelog
   packages/trunk/gnomekiss/debian/compat
   packages/trunk/gnomekiss/debian/control
   packages/trunk/gnomekiss/debian/patches/series
   packages/trunk/gnomekiss/debian/rules
   packages/trunk/gnomekiss/debian/watch
Log:
Update packaging.

Modified: packages/trunk/gnomekiss/debian/changelog
===================================================================
--- packages/trunk/gnomekiss/debian/changelog	2013-06-21 18:40:58 UTC (rev 14289)
+++ packages/trunk/gnomekiss/debian/changelog	2013-06-21 18:50:03 UTC (rev 14290)
@@ -1,3 +1,18 @@
+gnomekiss (2.0-5) unstable; urgency=low
+
+  [ Markus Koschany ]
+  * Add patch for about dialog close. (Closes: #653297).
+
+  [ Barry deFreese ]
+  * Add patch to fix deprecated GtkSpinButton error.
+  * Move to dh style rules.
+    + Bump debhelper build-dep and compat to 9.
+  * Add ${misc:Depends}.
+  * Update watch file.
+  * Bump Standards Version to 3.9.4.
+
+ -- Barry deFreese <bdefreese at debian.org>  Fri, 21 Jun 2013 07:36:37 -0400
+
 gnomekiss (2.0-4) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/gnomekiss/debian/compat
===================================================================
--- packages/trunk/gnomekiss/debian/compat	2013-06-21 18:40:58 UTC (rev 14289)
+++ packages/trunk/gnomekiss/debian/compat	2013-06-21 18:50:03 UTC (rev 14290)
@@ -1 +1 @@
-5
+9

Modified: packages/trunk/gnomekiss/debian/control
===================================================================
--- packages/trunk/gnomekiss/debian/control	2013-06-21 18:40:58 UTC (rev 14289)
+++ packages/trunk/gnomekiss/debian/control	2013-06-21 18:50:03 UTC (rev 14290)
@@ -3,18 +3,18 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5), quilt, autotools-dev, libgnome2-dev, libgnomeui-dev,
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, libgnome2-dev, libgnomeui-dev,
  gettext
-Standards-Version: 3.8.1
+Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/gnomekiss/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/gnomekiss/?op=log
 Homepage: http://devel.tlrmx.org/kiss/
 
 Package: gnomekiss
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: lha
-Description: A KiSS paper doll viewer for GNOME
+Description: KiSS paper doll viewer for GNOME
  GnomeKiSS is an implementation of French-KiSS for the GNOME desktop
  environment, using GNOME, GTK+ and the X Window System. French KiSS is an
  enhanced KiSS/GS for scriptable dolls, where KiSS is an abbreviation for

Added: packages/trunk/gnomekiss/debian/gnomekiss.install
===================================================================
--- packages/trunk/gnomekiss/debian/gnomekiss.install	                        (rev 0)
+++ packages/trunk/gnomekiss/debian/gnomekiss.install	2013-06-21 18:50:03 UTC (rev 14290)
@@ -0,0 +1,2 @@
+debian/gnomekiss.desktop usr/share/applications
+debian/gnomekiss.xpm usr/share/pixmaps/gnomekiss

Added: packages/trunk/gnomekiss/debian/patches/020_gtkspinbutton.patch
===================================================================
--- packages/trunk/gnomekiss/debian/patches/020_gtkspinbutton.patch	                        (rev 0)
+++ packages/trunk/gnomekiss/debian/patches/020_gtkspinbutton.patch	2013-06-21 18:50:03 UTC (rev 14290)
@@ -0,0 +1,24 @@
+Description: Fix deprecated adjustments for GtkSpinButton
+Author: Barry deFreese <bdefreese at debian.org>
+Index: gnomekiss-2.0/gnomekiss.glade
+===================================================================
+--- gnomekiss-2.0.orig/gnomekiss.glade	2006-01-20 11:07:52.000000000 -0500
++++ gnomekiss-2.0/gnomekiss.glade	2013-06-21 07:20:07.000000000 -0400
+@@ -1473,7 +1473,7 @@
+ 	      <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+ 	      <property name="snap_to_ticks">False</property>
+ 	      <property name="wrap">False</property>
+-	      <property name="adjustment">1 1 100 1 10 10</property>
++	      <property name="adjustment">1 1 100 1 10 0</property>
+ 	      <signal name="changed" handler="on_pref_speed_factor_changed"/>
+ 	    </widget>
+ 	    <packing>
+@@ -1523,7 +1523,7 @@
+ 	      <property name="update_policy">GTK_UPDATE_IF_VALID</property>
+ 	      <property name="snap_to_ticks">False</property>
+ 	      <property name="wrap">False</property>
+-	      <property name="adjustment">1 1 100 1 10 10</property>
++	      <property name="adjustment">1 1 100 1 10 0</property>
+ 	      <signal name="changed" handler="on_pref_min_timer_changed"/>
+ 	    </widget>
+ 	    <packing>

Modified: packages/trunk/gnomekiss/debian/patches/series
===================================================================
--- packages/trunk/gnomekiss/debian/patches/series	2013-06-21 18:40:58 UTC (rev 14289)
+++ packages/trunk/gnomekiss/debian/patches/series	2013-06-21 18:50:03 UTC (rev 14290)
@@ -1,2 +1,3 @@
 010_filename.diff
+020_gtkspinbutton.patch
 fix-close-button-of-about-dialog.patch

Modified: packages/trunk/gnomekiss/debian/rules
===================================================================
--- packages/trunk/gnomekiss/debian/rules	2013-06-21 18:40:58 UTC (rev 14289)
+++ packages/trunk/gnomekiss/debian/rules	2013-06-21 18:50:03 UTC (rev 14290)
@@ -4,109 +4,11 @@
 #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)
-
-# See if I am in an alpha or arm machine. If so, I need to build with supplied
-# gettext.
-#export  DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-#
-#ifeq (alpha-linux,$(DEB_HOST_GNU_TYPE))
-#	CONFIG_FLAGS = --with-included-gettext
-#endif
-#ifeq (arm-linux,$(DEB_HOST_GNU_TYPE))
-#	CONFIG_FLAGS = --with-included-gettext
-#endif
-# Commented out because I hope it's fixed, at last! :-)
-# Not deleted because you never know when these things come back.
-
-CFLAGS = -Wall -g
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
 	CFLAGS += -O2
 endif
 
-config.status: configure
-	dh_testdir
-
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-
-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 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" $(CONFIG_FLAGS)
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	#docbook-to-man debian/gnomekiss.sgml > gnomekiss.1
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-
-	rm -f build-stamp 
-
-	[ ! -f Makefile ] || $(MAKE) clean
-	rm -rf Makefile */Makefile */.deps po/POTFILES po/Makefile.in
-	rm -f config.sub config.guess config.h config.status config.log
-	rm -f po/*.mo
-	rm -f stamp-h1
-	rm -rf .pc
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/gnomekiss
-	install -D -m 0644 debian/gnomekiss.xpm $(CURDIR)/debian/gnomekiss/usr/share/pixmaps/gnomekiss/gnomekiss.xpm 
-	install -D -m 0644 debian/gnomekiss.desktop $(CURDIR)/debian/gnomekiss/usr/share/applications/gnomekiss.desktop
-
-
-# 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
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-	dh_installmenu
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh $@ --with autoreconf --with autotools-dev

Added: packages/trunk/gnomekiss/debian/source/format
===================================================================
--- packages/trunk/gnomekiss/debian/source/format	                        (rev 0)
+++ packages/trunk/gnomekiss/debian/source/format	2013-06-21 18:50:03 UTC (rev 14290)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: packages/trunk/gnomekiss/debian/watch
===================================================================
--- packages/trunk/gnomekiss/debian/watch	2013-06-21 18:40:58 UTC (rev 14289)
+++ packages/trunk/gnomekiss/debian/watch	2013-06-21 18:50:03 UTC (rev 14290)
@@ -1,6 +1,2 @@
-# 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
-http://www.ecs.soton.ac.uk/~njl98r/code/kiss/ gnomekiss-(.*)\.tar\.gz debian  uupdate
+version=3
+http://devel.tlrmx.org/kiss/source/gnomekiss-(.*)\.tar\.gz




More information about the Pkg-games-commits mailing list