Changeset 72aae3 in git

Timestamp:

Apr 30, 2013, 10:04:43 PM (10 years ago)

Author:

Mathias Schulze <mschulze@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

9dfcc6ef0099c869af8fdb1410d0fc1a36f444c0

Parents:

ec08e4a380cdd364bfcec2186fb3f303e2c825fa

Message:

Initial Redhat package support

* new folder redhat containing singular.spec file

* README files for debian and redhat

* moved moved debian/icons to desktop (now used by both debian and redhat)

* updated Makefile.am, configure.ac, debian/control, debian/rules

Files:

• Makefile.am (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/rules (modified) (1 diff)
• debian/source/include-binaries (modified) (1 diff)
• desktop/Singular-manual.desktop.in (moved) (moved from debian/icons/Singular-manual.desktop.in)
• desktop/Singular.desktop.in (moved) (moved from debian/icons/Singular.desktop.in)
• desktop/Singular.png (moved) (moved from debian/icons/Singular.png)
• redhat/singular.spec (added)

Makefile.am

@@ -31 +31 @@
 #       [ -d ${builddir}/emacs ] || ln -s ${srcdir}/emacs ${builddir}
 
-DEBIAN = \
+DEBIAN = README \
         debian/changelog \
         debian/compat \
@@ -42 +42 @@
         debian/singular-dev.install \
         debian/source/format \
-        debian/source/include-binaries \
-        debian/icons/Singular.png
+        debian/source/include-binaries
 
-EXTRA_DIST = autogen.sh $(EMACS) $(DEBIAN) 
+REDHAT = README \
+        redhat/singular.spec
+
+DESKTOP = desktop/Singular.png
+
+EXTRA_DIST = autogen.sh $(EMACS) $(DEBIAN) $(REDHAT) $(DESKTOP) 
 
 bin_SCRIPTS = libsingular-config

configure.ac

@@ -195 +195 @@
 AC_CONFIG_SUBDIRS([gfanlib])
 
-AC_CONFIG_FILES([debian/icons/Singular.desktop])
-AC_CONFIG_FILES([debian/icons/Singular-manual.desktop])
+AC_CONFIG_FILES([desktop/Singular.desktop])
+AC_CONFIG_FILES([desktop/Singular-manual.desktop])
 
 AC_OUTPUT

debian/control

@@ -44 +44 @@
  and singularity theory.
  .
- This package contains develoment files.
+ This package contains development files.
 

debian/rules

@@ -9 +9 @@
 override_dh_auto_install:
         dh_auto_install
-        install debian/icons/Singular.desktop debian/singular-common/usr/share/applications
-        install debian/icons/Singular-manual.desktop debian/singular-common/usr/share/applications
-        install debian/icons/Singular.png debian/singular-common/usr/share/icons
+        install desktop/Singular.desktop debian/singular-common/usr/share/applications
+        install desktop/Singular-manual.desktop debian/singular-common/usr/share/applications
+        install desktop/Singular.png debian/singular-common/usr/share/icons
 

debian/source/include-binaries

@@ -1 @@
-debian/icons/Singular.png
+desktop/Singular.png