[Debichem-commits] r983 - in /unstable/gperiodic/debian: changelog compat control patches/00list patches/11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch patches/15_fix_bohrium_data_set.dpatch rules

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Tue Jan 15 02:43:24 UTC 2008 

Author: dleidert-guest
Date: Tue Jan 15 02:43:23 2008
New Revision: 983

URL: http://svn.debian.org/wsvn/debichem/?sc=1&rev=983
Log:
* debian/compat: Raised to v5.
* debian/control: Added XS-DM-Upload-Allowed for DM status.
  (Build-Depends): Raised debhelper to v5.
  (Standards-Version): Raised to 3.7.3.
* debian/rules: Added common CFLAGS and LDFLAGS.
  (build-stamp): Use the CFLAGS and LDFLAGS during creation.
* debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch: Adjusted.
  - Makefile: Allow to set CFALGS and LDFLAGS easily.
* debian/patches/15_fix_bohrium_data_set.dpatch: Added.
  - table_data.h: Fixed the data set for Bohrium. The Electronic
    Configuration was shown in the Oxidation States field.
* debian/patches/00list: Adjusted.

Added:
    unstable/gperiodic/debian/patches/15_fix_bohrium_data_set.dpatch   (with props)
Modified:
    unstable/gperiodic/debian/changelog
    unstable/gperiodic/debian/compat
    unstable/gperiodic/debian/control
    unstable/gperiodic/debian/patches/00list
    unstable/gperiodic/debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch
    unstable/gperiodic/debian/rules

Modified: unstable/gperiodic/debian/changelog
URL: http://svn.debian.org/wsvn/debichem/unstable/gperiodic/debian/changelog?rev=983&op=diff
==============================================================================
--- unstable/gperiodic/debian/changelog (original)
+++ unstable/gperiodic/debian/changelog Tue Jan 15 02:43:23 2008
@@ -3,8 +3,18 @@
   * NOT RELEASED YET
 
   [ Daniel Leidert ]
-  * debian/control (Standards-Version): Updated to latest version (no other
-    changes).
+  * debian/compat: Raised to v5.
+  * debian/control: Added XS-DM-Upload-Allowed for DM status.
+    (Build-Depends): Raised debhelper to v5.
+    (Standards-Version): Raised to 3.7.3.
+  * debian/rules: Added common CFLAGS and LDFLAGS.
+    (build-stamp): Use the CFLAGS and LDFLAGS during creation.
+  * debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch: Adjusted.
+    - Makefile: Allow to set CFALGS and LDFLAGS easily.
+  * debian/patches/15_fix_bohrium_data_set.dpatch: Added.
+    - table_data.h: Fixed the data set for Bohrium. The Electronic
+      Configuration was shown in the Oxidation States field.
+  * debian/patches/00list: Adjusted.
 
   [ Michael Banck ]
   * debian/control (Description): Do not mention available translations.

Modified: unstable/gperiodic/debian/compat
URL: http://svn.debian.org/wsvn/debichem/unstable/gperiodic/debian/compat?rev=983&op=diff
==============================================================================
--- unstable/gperiodic/debian/compat (original)
+++ unstable/gperiodic/debian/compat Tue Jan 15 02:43:23 2008
@@ -1,1 +1,1 @@
-4
+5

Modified: unstable/gperiodic/debian/control
URL: http://svn.debian.org/wsvn/debichem/unstable/gperiodic/debian/control?rev=983&op=diff
==============================================================================
--- unstable/gperiodic/debian/control (original)
+++ unstable/gperiodic/debian/control Tue Jan 15 02:43:23 2008
@@ -3,11 +3,12 @@
 Priority: optional
 Maintainer: Debichem Team <debichem-devel at lists.alioth.debian.org>
 Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Build-Depends: debhelper (>= 5), dpatch, libgtk2.0-dev (>= 2.6)
 Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 4), dpatch, libgtk2.0-dev (>= 2.6)
 Homepage: http://www.frantz.fi/software/gperiodic.php
 Vcs-Browser: http://svn.debian.org/wsvn/debichem/
 Vcs-Svn: svn+ssh://svn.debian.org/svn/debichem/unstable/gperiodic/
+XS-DM-Upload-Allowed: yes
 
 Package: gperiodic
 Architecture: any

Modified: unstable/gperiodic/debian/patches/00list
URL: http://svn.debian.org/wsvn/debichem/unstable/gperiodic/debian/patches/00list?rev=983&op=diff
==============================================================================
--- unstable/gperiodic/debian/patches/00list (original)
+++ unstable/gperiodic/debian/patches/00list Tue Jan 15 02:43:23 2008
@@ -2,3 +2,4 @@
 12_fix_desktop_file
 13_fix_zink_description
 14_fix_lithium_melting_point
+15_fix_bohrium_data_set

Modified: unstable/gperiodic/debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch
URL: http://svn.debian.org/wsvn/debichem/unstable/gperiodic/debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch?rev=983&op=diff
==============================================================================
--- unstable/gperiodic/debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch (original)
+++ unstable/gperiodic/debian/patches/11_remove_DEPRECATED_flags_for_GTK_2_4.dpatch Tue Jan 15 02:43:23 2008
@@ -3,18 +3,35 @@
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: * Makefile (CFLAGS): Remove the DEPRECATED flags to build fine with
-## DP:     GTK+2.4.
+## DP:     GTK+2.4. Add the LDFLAGS variable to give some linker flags.
+## DP:
+## DP:     Added possibility to set some CFLAGS and LDFLAGS. Proposal has been
+## DP:     sent to Jonas Frantz.
 ## DP:
 ## DP: <URL:http://packages.debian.org/changelogs/pool/main/g/gperiodic/current/changelog#versionversion2.0.7-4>
 
 @DPATCH@
 diff -urNad gperiodic~/Makefile gperiodic/Makefile
---- gperiodic~/Makefile	2007-06-13 22:21:44.000000000 +0200
-+++ gperiodic/Makefile	2007-07-01 00:11:13.000000000 +0200
-@@ -1,5 +1,5 @@
+--- gperiodic~/Makefile	2007-07-11 14:58:05.000000000 +0200
++++ gperiodic/Makefile	2008-01-15 03:27:12.000000000 +0100
+@@ -1,6 +1,9 @@
  CC := gcc
 -CFLAGS := `pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
-+CFLAGS := `pkg-config --cflags gtk+-2.0` -I.
- LIBS :=`pkg-config --libs gtk+-2.0`
+-LIBS :=`pkg-config --libs gtk+-2.0`
++CFLAGS :=
++LIBS := 
++LDFLAGS :=
++override CFLAGS += `pkg-config --cflags gtk+-2.0` -I.
++override LIBS += `pkg-config --libs gtk+-2.0`
  bindir ?= /usr/bin
  datadir ?= /usr/share
+ enable_nls ?= 1
+@@ -13,7 +16,7 @@
+ 	make -C po/ all enable_nls=$(enable_nls)
+ 
+ gperiodic: gperiodic.o
+-	$(CC) $(CFLAGS) -o gperiodic gperiodic.o $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o gperiodic gperiodic.o $(LIBS)
+ ifeq ($(strip),1)
+ 	strip gperiodic
+ endif

Added: unstable/gperiodic/debian/patches/15_fix_bohrium_data_set.dpatch
URL: http://svn.debian.org/wsvn/debichem/unstable/gperiodic/debian/patches/15_fix_bohrium_data_set.dpatch?rev=983&op=file
==============================================================================
--- unstable/gperiodic/debian/patches/15_fix_bohrium_data_set.dpatch (added)
+++ unstable/gperiodic/debian/patches/15_fix_bohrium_data_set.dpatch Tue Jan 15 02:43:23 2008
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_fix_bohrium_data_set.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The Electronic Configuration for Bohrium is shown in the Oxidation
+## DP:   States field. This patch fixes this.
+## DP:
+## DP: <URL:http://cvs.fedoraproject.org/viewcvs/*checkout*/rpms/gperiodic/devel/gperiodic-bh.patch>
+
+ at DPATCH@
+diff -urNad gperiodic~/table_data.h gperiodic/table_data.h
+--- gperiodic~/table_data.h	2008-01-15 03:18:41.000000000 +0100
++++ gperiodic/table_data.h	2008-01-15 03:20:02.000000000 +0100
+@@ -265,7 +265,7 @@
+   {N_("Rutherfordium"), "Rf", "104", "[261]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>2</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1969 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Ernest Rutherford"), 4, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+   {N_("Dubnium"), "Db", "105", "[262]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>3</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1970 (United States)"), N_("A. Ghiorso, et al"), N_("Named in honor of Otto Hahn"), 5, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+   {N_("Seaborgium"), "Sg", "106", "[266]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>4</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1974 (USSR/United States)"), N_("Soviet Nuclear Research/ U. of Cal at Berkeley"), N_("Named in honor of Glenn Seaborg, American physical chemist known for research on transuranium elements."), 6, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+-  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>5</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
++  {N_("Bohrium"), "Bh", "107", "[264]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>5</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("Radioactive, synthetic metal"), N_("1976 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Niels Bohr"), 7, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+   {N_("Hassium"), "Hs", "108", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>6</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1984 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Henri Hess, Swiss born Russian chemist known for work in thermodydamics."), 8, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA},
+   {N_("Meitnerium"), "Mt", "109", "[268]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>7</sup> 7s<sup>2</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1982 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Named in honor of Lise Mietner"), 9, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 
+   {N_("Ununnilium"), "Uun", "110", "[269]", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), "[Rn] 5f<sup>14</sup> 6d<sup>9</sup> 7s<sup>1</sup>", N_("n/a"), N_("n/a"), N_("n/a"), N_("n/a"), N_("1994 (Germany)"), N_("Heavy Ion Research Laboratory (HIRL)"), N_("Un (one) nun (one) nilium (zero)"), 10, 7, 0x7FFFFFFF, 0xFFFF, 0xFFFF, 0xAAAA}, 

Propchange: unstable/gperiodic/debian/patches/15_fix_bohrium_data_set.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: unstable/gperiodic/debian/rules
URL: http://svn.debian.org/wsvn/debichem/unstable/gperiodic/debian/rules?rev=983&op=diff
==============================================================================
--- unstable/gperiodic/debian/rules (original)
+++ unstable/gperiodic/debian/rules Tue Jan 15 02:43:23 2008
@@ -1,13 +1,24 @@
 #!/usr/bin/make -f
 
 PACKAGE = gperiodic
+
+CFLAGS = -Wall -g
+LDFLAGS = -Wl,-z,defs -Wl,--as-needed
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+	LDFLAGS += -Wl,-O1
+endif
+
 
 include /usr/share/dpatch/dpatch.make
 
 build: patch-stamp build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE)
+	$(MAKE) LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)"
 	touch $@
 
 clean: unpatch

More information about the Debichem-commits mailing list